Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 24834)
+++ applications/editors/josm/i18n/po/de.po	(revision 24916)
@@ -9,7 +9,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-21 22:47+0100\n"
-"PO-Revision-Date: 2010-12-20 14:32+0000\n"
-"Last-Translator: Fichtennadel <Unknown>\n"
+"POT-Creation-Date: 2010-12-30 15:20+0100\n"
+"PO-Revision-Date: 2010-12-29 00:38+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-12-21 19:11+0000\n"
-"X-Generator: Launchpad (build 12093)\n"
+"X-Launchpad-Export-Date: 2010-12-30 12:00+0000\n"
+"X-Generator: Launchpad (build 12138)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:131
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:130
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:203
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
@@ -95,5 +95,4 @@
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSGrabber.java:130
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:146
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -281,6 +280,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:437
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
@@ -294,5 +293,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1104
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1105
@@ -306,6 +305,4 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:167
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:153
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
@@ -321,5 +318,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:98
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107
 #: build/specialmessages.java:33
 msgid "Cancel"
@@ -365,5 +362,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java:18
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/AddImageryLayerAction.java:15
 #, java-format
 msgid "Add imagery layer {0}"
@@ -500,5 +496,4 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1012
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:43
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:118
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:40
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
@@ -610,5 +605,5 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:19
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69
 #, java-format
 msgid "File: {0}"
@@ -755,6 +750,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:93
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:63
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:132
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:257
@@ -824,5 +817,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:74
 msgid "Separate Layer"
 msgstr "Separate Ebene"
@@ -842,5 +835,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:83
 msgid "Object type:"
 msgstr "Objekttyp:"
@@ -851,5 +844,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:91
 msgid "Object ID:"
 msgstr "Objekt ID:"
@@ -1046,5 +1039,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:167
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:669
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:86
 msgid "Easting"
 msgstr "Rechtswert"
@@ -1052,17 +1044,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:169
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:669
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:86
 msgid "Northing"
 msgstr "Hochwert"
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:171
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java:128
 msgid "Bookmark name: "
 msgstr "Lesezeichen-Name: "
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:205
-#, fuzzy
 msgid "Offset bookmark already exists. Overwrite?"
-msgstr "Datei existiert bereits. Überschreiben?"
+msgstr "Versatz-Lesezeichen bereits vorhanden. Überschreiben?"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
@@ -1116,5 +1105,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:598
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:291
 msgid "Please abort if you are not sure"
 msgstr "Bitte abbrechen, falls Sie nicht sicher sind"
@@ -1283,16 +1271,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:68
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:72
 msgid "Rectified Image..."
 msgstr "Berichtigtes Bild..."
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:70
 msgid "Download Rectified Images From Various Services"
 msgstr "Berichtigte Bilder von verschiedenen Diensten herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:73
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:72
 #, java-format
 msgid "WMS: {0}"
@@ -1304,20 +1288,16 @@
 #. service will never be selected automatically.
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:108
 msgid "Custom WMS Link"
 msgstr "Angepasste WMS-URL"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:114
 msgid "Supported Rectifier Services:"
 msgstr "Unterstützte Berichtigungsservices:"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:141
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:138
 msgid "Visit Homepage"
 msgstr "Webseite besuchen"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:152
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:147
 msgid "WMS URL or Image ID:"
 msgstr "WMS-URL oder Bild-ID:"
@@ -1325,11 +1305,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:156
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:153
 msgid "Add Rectified Image"
 msgstr "Berichtigtes Bild hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:203
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -1340,5 +1317,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/Map_Rectifier_WMSmenuAction.java:204
 msgid "No valid WMS URL or id"
 msgstr "Keine gültige WMS-URL oder ID"
@@ -1817,6 +1793,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:509
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:666
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:675
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1829,7 +1805,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:757
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:114
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:959
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:969
@@ -1848,5 +1824,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1113
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1358
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -1856,6 +1832,4 @@
 #: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java:74
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:508
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:665
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:159
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:84
@@ -1914,5 +1888,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:216
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:224
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:251
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
@@ -2052,6 +2026,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:233
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:237
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
 msgid "No, abort"
@@ -2083,5 +2056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:90
 msgid "Yes"
@@ -2733,5 +2706,4 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3419,5 +3391,5 @@
 msgstr "Gegenseitige Abhängigkeiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:111
+#: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:113
 msgid "Data with errors. Upload anyway?"
 msgstr "Die Daten enthalten Fehler. Trotzdem hochladen?"
@@ -4069,10 +4041,8 @@
 
 #: ../core/src/org/openstreetmap/josm/data/imagery/GeorefImage.java:90
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/GeorefImage.java:93
 msgid "Not in cache"
 msgstr "Nicht im Zwischenspeicher"
 
 #: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:47
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmark.java:44
 #, java-format
 msgid "Projection ''{0}'' not found"
@@ -4099,6 +4069,6 @@
 "JOSM fortsetzen können."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -4109,5 +4079,5 @@
 "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:182
 #, java-format
 msgid ""
@@ -4118,5 +4088,5 @@
 "im Quelldatensatz"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -4126,5 +4096,5 @@
 "gefunden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:262
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -4135,5 +4105,5 @@
 "nicht gefunden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:267
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -4148,5 +4118,5 @@
 #. For example, datasets can be fetched from different OSM servers or badly hand-modified.
 #. We shouldn't merge that datasets.
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:318
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315
 #, java-format
 msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
@@ -4494,5 +4464,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102
-#: build/trans_presets.java:1536 build/trans_presets.java:3393
+#: build/trans_presets.java:1543 build/trans_presets.java:3400
 msgid "Other"
 msgstr "Andere"
@@ -4653,5 +4623,5 @@
 #. item "Relations/Multipolygon"
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:48
-#: build/trans_presets.java:4026
+#: build/trans_presets.java:4033
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -4979,6 +4949,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:77
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:53
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:106
 msgid "Add"
@@ -5001,6 +4969,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:679
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:484
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:674
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
@@ -5020,6 +4988,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:651
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:99
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:69
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
 msgid "Please select the row to delete."
@@ -5471,7 +5437,8 @@
 msgstr "Straße"
 
+#. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:4079
+#: build/trans_presets.java:4086
 msgid "railway"
 msgstr "Eisenbahn"
@@ -5606,24 +5573,19 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:31
-#, fuzzy
 msgid "Imagery offset"
-msgstr "Bildversatz anpassen"
+msgstr "Hintergrundbild-Versatz"
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:221
 msgid "Imagery"
 msgstr "Hintergrund"
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:92
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:107
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:234
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:99
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:111
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:90
 msgid "Blank Layer"
 msgstr "Leere Ebene"
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:92
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:234
 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"
@@ -5631,5 +5593,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:155
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java:157
 msgctxt "layer"
 msgid "Offset"
@@ -6494,6 +6455,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:194
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:463
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:653
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java:26
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -6805,7 +6766,8 @@
 msgstr "Kein"
 
+#. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
-#: build/trans_presets.java:4010
+#: build/trans_presets.java:4017
 msgid "all"
 msgstr "alle"
@@ -7052,5 +7014,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:134
 msgid "Changesets"
 msgstr "Änderungssätze"
@@ -7347,5 +7309,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../plugins/reverter/src/reverter/ReverterPlugin.java:18
+#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20
 msgid "History"
 msgstr "Versionsprotokoll"
@@ -7362,5 +7324,5 @@
 #: ../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:534
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:529
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
@@ -7466,5 +7428,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:571
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:506
 msgid "Activate"
 msgstr "Aktivieren"
@@ -7514,5 +7476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:769
-#: build/trans_presets.java:4025
+#: build/trans_presets.java:4032
 msgid "Relations"
 msgstr "Relationen"
@@ -8900,179 +8862,178 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:86
-#: build/specialmessages.java:57 build/trans_presets.java:89
-#: build/trans_presets.java:127 build/trans_presets.java:169
-#: build/trans_presets.java:209 build/trans_presets.java:230
-#: build/trans_presets.java:249 build/trans_presets.java:268
-#: build/trans_presets.java:287 build/trans_presets.java:306
-#: build/trans_presets.java:327 build/trans_presets.java:362
-#: build/trans_presets.java:382 build/trans_presets.java:433
-#: build/trans_presets.java:453 build/trans_presets.java:468
-#: build/trans_presets.java:483 build/trans_presets.java:507
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:588 build/trans_presets.java:611
-#: build/trans_presets.java:631 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:680
-#: build/trans_presets.java:691 build/trans_presets.java:753
-#: build/trans_presets.java:777 build/trans_presets.java:786
-#: build/trans_presets.java:847 build/trans_presets.java:1000
-#: build/trans_presets.java:1008 build/trans_presets.java:1016
-#: build/trans_presets.java:1024 build/trans_presets.java:1035
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1058 build/trans_presets.java:1065
-#: build/trans_presets.java:1079 build/trans_presets.java:1086
-#: build/trans_presets.java:1091 build/trans_presets.java:1098
-#: build/trans_presets.java:1103 build/trans_presets.java:1109
-#: build/trans_presets.java:1116 build/trans_presets.java:1126
-#: build/trans_presets.java:1132 build/trans_presets.java:1138
-#: build/trans_presets.java:1143 build/trans_presets.java:1149
-#: build/trans_presets.java:1157 build/trans_presets.java:1166
-#: build/trans_presets.java:1173 build/trans_presets.java:1179
-#: build/trans_presets.java:1196 build/trans_presets.java:1203
-#: build/trans_presets.java:1210 build/trans_presets.java:1307
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1376
-#: build/trans_presets.java:1383 build/trans_presets.java:1389
-#: build/trans_presets.java:1394 build/trans_presets.java:1404
-#: build/trans_presets.java:1425 build/trans_presets.java:1457
-#: build/trans_presets.java:1467 build/trans_presets.java:1473
-#: build/trans_presets.java:1481 build/trans_presets.java:1497
-#: build/trans_presets.java:1506 build/trans_presets.java:1516
-#: build/trans_presets.java:1525 build/trans_presets.java:1549
-#: build/trans_presets.java:1557 build/trans_presets.java:1564
-#: build/trans_presets.java:1575 build/trans_presets.java:1585
-#: build/trans_presets.java:1595 build/trans_presets.java:1615
-#: build/trans_presets.java:1627 build/trans_presets.java:1638
-#: build/trans_presets.java:1658 build/trans_presets.java:1673
-#: build/trans_presets.java:1681 build/trans_presets.java:1738
-#: build/trans_presets.java:1755 build/trans_presets.java:1773
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1824 build/trans_presets.java:1841
-#: build/trans_presets.java:1859 build/trans_presets.java:1881
-#: build/trans_presets.java:1900 build/trans_presets.java:1921
-#: build/trans_presets.java:1940 build/trans_presets.java:1957
-#: build/trans_presets.java:1976 build/trans_presets.java:1994
-#: build/trans_presets.java:2011 build/trans_presets.java:2028
-#: build/trans_presets.java:2044 build/trans_presets.java:2051
-#: build/trans_presets.java:2059 build/trans_presets.java:2066
-#: build/trans_presets.java:2083 build/trans_presets.java:2091
-#: build/trans_presets.java:2107 build/trans_presets.java:2117
-#: build/trans_presets.java:2129 build/trans_presets.java:2139
-#: build/trans_presets.java:2146 build/trans_presets.java:2153
-#: build/trans_presets.java:2159 build/trans_presets.java:2168
-#: build/trans_presets.java:2178 build/trans_presets.java:2183
-#: build/trans_presets.java:2191 build/trans_presets.java:2198
-#: build/trans_presets.java:2206 build/trans_presets.java:2215
-#: build/trans_presets.java:2222 build/trans_presets.java:2229
-#: build/trans_presets.java:2235 build/trans_presets.java:2243
-#: build/trans_presets.java:2253 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2286 build/trans_presets.java:2293
-#: build/trans_presets.java:2300 build/trans_presets.java:2308
-#: build/trans_presets.java:2315 build/trans_presets.java:2321
-#: build/trans_presets.java:2329 build/trans_presets.java:2335
-#: build/trans_presets.java:2341 build/trans_presets.java:2347
-#: build/trans_presets.java:2354 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2378
-#: build/trans_presets.java:2386 build/trans_presets.java:2394
-#: build/trans_presets.java:2421 build/trans_presets.java:2498
-#: build/trans_presets.java:2515 build/trans_presets.java:2530
-#: build/trans_presets.java:2539 build/trans_presets.java:2548
-#: build/trans_presets.java:2557 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2580
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2598 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2616
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2634 build/trans_presets.java:2640
-#: build/trans_presets.java:2646 build/trans_presets.java:2652
-#: build/trans_presets.java:2658 build/trans_presets.java:2665
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2688 build/trans_presets.java:2694
-#: build/trans_presets.java:2700 build/trans_presets.java:2706
-#: build/trans_presets.java:2712 build/trans_presets.java:2718
-#: build/trans_presets.java:2724 build/trans_presets.java:2730
-#: build/trans_presets.java:2738 build/trans_presets.java:2747
-#: build/trans_presets.java:2754 build/trans_presets.java:2760
-#: build/trans_presets.java:2766 build/trans_presets.java:2772
-#: build/trans_presets.java:2778 build/trans_presets.java:2784
-#: build/trans_presets.java:2790 build/trans_presets.java:2796
-#: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2866
-#: build/trans_presets.java:2881 build/trans_presets.java:2888
-#: build/trans_presets.java:2896 build/trans_presets.java:2901
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2935 build/trans_presets.java:2945
-#: build/trans_presets.java:2952 build/trans_presets.java:2961
-#: build/trans_presets.java:2968 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2988
-#: build/trans_presets.java:2994 build/trans_presets.java:3008
-#: build/trans_presets.java:3018 build/trans_presets.java:3024
-#: build/trans_presets.java:3036 build/trans_presets.java:3043
-#: build/trans_presets.java:3099 build/trans_presets.java:3105
-#: build/trans_presets.java:3113 build/trans_presets.java:3120
-#: build/trans_presets.java:3126 build/trans_presets.java:3132
-#: build/trans_presets.java:3138 build/trans_presets.java:3143
-#: build/trans_presets.java:3148 build/trans_presets.java:3153
-#: build/trans_presets.java:3162 build/trans_presets.java:3169
-#: build/trans_presets.java:3176 build/trans_presets.java:3184
-#: build/trans_presets.java:3191 build/trans_presets.java:3199
-#: build/trans_presets.java:3208 build/trans_presets.java:3216
-#: build/trans_presets.java:3225 build/trans_presets.java:3234
-#: build/trans_presets.java:3241 build/trans_presets.java:3249
-#: build/trans_presets.java:3255 build/trans_presets.java:3263
-#: build/trans_presets.java:3271 build/trans_presets.java:3278
-#: build/trans_presets.java:3285 build/trans_presets.java:3291
-#: build/trans_presets.java:3299 build/trans_presets.java:3306
-#: build/trans_presets.java:3312 build/trans_presets.java:3320
-#: build/trans_presets.java:3329 build/trans_presets.java:3335
-#: build/trans_presets.java:3343 build/trans_presets.java:3352
-#: build/trans_presets.java:3359 build/trans_presets.java:3365
-#: build/trans_presets.java:3374 build/trans_presets.java:3383
-#: build/trans_presets.java:3399 build/trans_presets.java:3408
-#: build/trans_presets.java:3416 build/trans_presets.java:3422
-#: build/trans_presets.java:3428 build/trans_presets.java:3436
-#: build/trans_presets.java:3445 build/trans_presets.java:3454
-#: build/trans_presets.java:3461 build/trans_presets.java:3469
-#: build/trans_presets.java:3476 build/trans_presets.java:3484
-#: build/trans_presets.java:3492 build/trans_presets.java:3500
-#: build/trans_presets.java:3509 build/trans_presets.java:3518
-#: build/trans_presets.java:3526 build/trans_presets.java:3534
-#: build/trans_presets.java:3541 build/trans_presets.java:3548
-#: build/trans_presets.java:3556 build/trans_presets.java:3563
-#: build/trans_presets.java:3571 build/trans_presets.java:3598
-#: build/trans_presets.java:3604 build/trans_presets.java:3610
-#: build/trans_presets.java:3616 build/trans_presets.java:3622
-#: build/trans_presets.java:3630 build/trans_presets.java:3637
-#: build/trans_presets.java:3644 build/trans_presets.java:3651
-#: build/trans_presets.java:3658 build/trans_presets.java:3666
-#: build/trans_presets.java:3674 build/trans_presets.java:3682
-#: build/trans_presets.java:3689 build/trans_presets.java:3696
-#: build/trans_presets.java:3705 build/trans_presets.java:3714
-#: build/trans_presets.java:3722 build/trans_presets.java:3730
-#: build/trans_presets.java:3738 build/trans_presets.java:3747
-#: build/trans_presets.java:3755 build/trans_presets.java:3765
-#: build/trans_presets.java:3775 build/trans_presets.java:3784
-#: build/trans_presets.java:3790 build/trans_presets.java:3796
-#: build/trans_presets.java:3802 build/trans_presets.java:3807
-#: build/trans_presets.java:3813 build/trans_presets.java:3823
-#: build/trans_presets.java:3829 build/trans_presets.java:3835
-#: build/trans_presets.java:3841 build/trans_presets.java:3848
-#: build/trans_presets.java:3855 build/trans_presets.java:3861
-#: build/trans_presets.java:3867 build/trans_presets.java:3874
-#: build/trans_presets.java:3880 build/trans_presets.java:3885
-#: build/trans_presets.java:3892 build/trans_presets.java:3899
-#: build/trans_presets.java:3905 build/trans_presets.java:3914
-#: build/trans_presets.java:3922 build/trans_presets.java:3928
-#: build/trans_presets.java:3934 build/trans_presets.java:3941
-#: build/trans_presets.java:3949 build/trans_presets.java:3955
-#: build/trans_presets.java:3962 build/trans_presets.java:3968
-#: build/trans_presets.java:3974 build/trans_presets.java:3980
-#: build/trans_presets.java:3986 build/trans_presets.java:4033
-#: build/trans_presets.java:4047 build/trans_presets.java:4066
-#: build/trans_presets.java:4080 build/trans_presets.java:4103
+#: build/specialmessages.java:57 build/trans_presets.java:96
+#: build/trans_presets.java:134 build/trans_presets.java:176
+#: build/trans_presets.java:216 build/trans_presets.java:237
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:294 build/trans_presets.java:313
+#: build/trans_presets.java:334 build/trans_presets.java:369
+#: build/trans_presets.java:389 build/trans_presets.java:440
+#: build/trans_presets.java:460 build/trans_presets.java:475
+#: build/trans_presets.java:490 build/trans_presets.java:514
+#: build/trans_presets.java:550 build/trans_presets.java:571
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:638 build/trans_presets.java:658
+#: build/trans_presets.java:678 build/trans_presets.java:687
+#: build/trans_presets.java:698 build/trans_presets.java:760
+#: build/trans_presets.java:784 build/trans_presets.java:793
+#: build/trans_presets.java:854 build/trans_presets.java:1007
+#: build/trans_presets.java:1015 build/trans_presets.java:1023
+#: build/trans_presets.java:1031 build/trans_presets.java:1042
+#: build/trans_presets.java:1051 build/trans_presets.java:1057
+#: build/trans_presets.java:1065 build/trans_presets.java:1072
+#: build/trans_presets.java:1086 build/trans_presets.java:1093
+#: build/trans_presets.java:1098 build/trans_presets.java:1105
+#: build/trans_presets.java:1110 build/trans_presets.java:1116
+#: build/trans_presets.java:1123 build/trans_presets.java:1133
+#: build/trans_presets.java:1139 build/trans_presets.java:1145
+#: build/trans_presets.java:1150 build/trans_presets.java:1156
+#: build/trans_presets.java:1164 build/trans_presets.java:1173
+#: build/trans_presets.java:1180 build/trans_presets.java:1186
+#: build/trans_presets.java:1203 build/trans_presets.java:1210
+#: build/trans_presets.java:1217 build/trans_presets.java:1314
+#: build/trans_presets.java:1365 build/trans_presets.java:1371
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1390 build/trans_presets.java:1396
+#: build/trans_presets.java:1401 build/trans_presets.java:1411
+#: build/trans_presets.java:1432 build/trans_presets.java:1464
+#: build/trans_presets.java:1474 build/trans_presets.java:1480
+#: build/trans_presets.java:1488 build/trans_presets.java:1504
+#: build/trans_presets.java:1513 build/trans_presets.java:1523
+#: build/trans_presets.java:1532 build/trans_presets.java:1556
+#: build/trans_presets.java:1564 build/trans_presets.java:1571
+#: build/trans_presets.java:1582 build/trans_presets.java:1592
+#: build/trans_presets.java:1602 build/trans_presets.java:1622
+#: build/trans_presets.java:1634 build/trans_presets.java:1645
+#: build/trans_presets.java:1665 build/trans_presets.java:1680
+#: build/trans_presets.java:1688 build/trans_presets.java:1745
+#: build/trans_presets.java:1762 build/trans_presets.java:1780
+#: build/trans_presets.java:1797 build/trans_presets.java:1814
+#: build/trans_presets.java:1831 build/trans_presets.java:1848
+#: build/trans_presets.java:1866 build/trans_presets.java:1888
+#: build/trans_presets.java:1907 build/trans_presets.java:1928
+#: build/trans_presets.java:1947 build/trans_presets.java:1964
+#: build/trans_presets.java:1983 build/trans_presets.java:2001
+#: build/trans_presets.java:2018 build/trans_presets.java:2035
+#: build/trans_presets.java:2051 build/trans_presets.java:2058
+#: build/trans_presets.java:2066 build/trans_presets.java:2073
+#: build/trans_presets.java:2090 build/trans_presets.java:2098
+#: build/trans_presets.java:2114 build/trans_presets.java:2124
+#: build/trans_presets.java:2136 build/trans_presets.java:2146
+#: build/trans_presets.java:2153 build/trans_presets.java:2160
+#: build/trans_presets.java:2166 build/trans_presets.java:2175
+#: build/trans_presets.java:2185 build/trans_presets.java:2190
+#: build/trans_presets.java:2198 build/trans_presets.java:2205
+#: build/trans_presets.java:2213 build/trans_presets.java:2222
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2242 build/trans_presets.java:2250
+#: build/trans_presets.java:2260 build/trans_presets.java:2272
+#: build/trans_presets.java:2278 build/trans_presets.java:2285
+#: build/trans_presets.java:2293 build/trans_presets.java:2300
+#: build/trans_presets.java:2307 build/trans_presets.java:2315
+#: build/trans_presets.java:2322 build/trans_presets.java:2328
+#: build/trans_presets.java:2336 build/trans_presets.java:2342
+#: build/trans_presets.java:2348 build/trans_presets.java:2354
+#: build/trans_presets.java:2361 build/trans_presets.java:2371
+#: build/trans_presets.java:2377 build/trans_presets.java:2385
+#: build/trans_presets.java:2393 build/trans_presets.java:2401
+#: build/trans_presets.java:2428 build/trans_presets.java:2505
+#: build/trans_presets.java:2522 build/trans_presets.java:2537
+#: build/trans_presets.java:2546 build/trans_presets.java:2555
+#: build/trans_presets.java:2564 build/trans_presets.java:2573
+#: build/trans_presets.java:2579 build/trans_presets.java:2587
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2681 build/trans_presets.java:2689
+#: build/trans_presets.java:2695 build/trans_presets.java:2701
+#: build/trans_presets.java:2707 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2737
+#: build/trans_presets.java:2745 build/trans_presets.java:2754
+#: build/trans_presets.java:2761 build/trans_presets.java:2767
+#: build/trans_presets.java:2773 build/trans_presets.java:2779
+#: build/trans_presets.java:2785 build/trans_presets.java:2791
+#: build/trans_presets.java:2797 build/trans_presets.java:2803
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2835 build/trans_presets.java:2841
+#: build/trans_presets.java:2847 build/trans_presets.java:2854
+#: build/trans_presets.java:2860 build/trans_presets.java:2873
+#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:2903 build/trans_presets.java:2908
+#: build/trans_presets.java:2923 build/trans_presets.java:2930
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
+#: build/trans_presets.java:2959 build/trans_presets.java:2968
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3015
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3043 build/trans_presets.java:3050
+#: build/trans_presets.java:3106 build/trans_presets.java:3112
+#: build/trans_presets.java:3120 build/trans_presets.java:3127
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3150
+#: build/trans_presets.java:3155 build/trans_presets.java:3160
+#: build/trans_presets.java:3169 build/trans_presets.java:3176
+#: build/trans_presets.java:3183 build/trans_presets.java:3191
+#: build/trans_presets.java:3198 build/trans_presets.java:3206
+#: build/trans_presets.java:3215 build/trans_presets.java:3223
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3248 build/trans_presets.java:3256
+#: build/trans_presets.java:3262 build/trans_presets.java:3270
+#: build/trans_presets.java:3278 build/trans_presets.java:3285
+#: build/trans_presets.java:3292 build/trans_presets.java:3298
+#: build/trans_presets.java:3306 build/trans_presets.java:3313
+#: build/trans_presets.java:3319 build/trans_presets.java:3327
+#: build/trans_presets.java:3336 build/trans_presets.java:3342
+#: build/trans_presets.java:3350 build/trans_presets.java:3359
+#: build/trans_presets.java:3366 build/trans_presets.java:3372
+#: build/trans_presets.java:3381 build/trans_presets.java:3390
+#: build/trans_presets.java:3406 build/trans_presets.java:3415
+#: build/trans_presets.java:3423 build/trans_presets.java:3429
+#: build/trans_presets.java:3435 build/trans_presets.java:3443
+#: build/trans_presets.java:3452 build/trans_presets.java:3461
+#: build/trans_presets.java:3468 build/trans_presets.java:3476
+#: build/trans_presets.java:3483 build/trans_presets.java:3491
+#: build/trans_presets.java:3499 build/trans_presets.java:3507
+#: build/trans_presets.java:3516 build/trans_presets.java:3525
+#: build/trans_presets.java:3533 build/trans_presets.java:3541
+#: build/trans_presets.java:3548 build/trans_presets.java:3555
+#: build/trans_presets.java:3563 build/trans_presets.java:3570
+#: build/trans_presets.java:3578 build/trans_presets.java:3605
+#: build/trans_presets.java:3611 build/trans_presets.java:3617
+#: build/trans_presets.java:3623 build/trans_presets.java:3629
+#: build/trans_presets.java:3637 build/trans_presets.java:3644
+#: build/trans_presets.java:3651 build/trans_presets.java:3658
+#: build/trans_presets.java:3665 build/trans_presets.java:3673
+#: build/trans_presets.java:3681 build/trans_presets.java:3689
+#: build/trans_presets.java:3696 build/trans_presets.java:3703
+#: build/trans_presets.java:3712 build/trans_presets.java:3721
+#: build/trans_presets.java:3729 build/trans_presets.java:3737
+#: build/trans_presets.java:3745 build/trans_presets.java:3754
+#: build/trans_presets.java:3762 build/trans_presets.java:3772
+#: build/trans_presets.java:3782 build/trans_presets.java:3791
+#: build/trans_presets.java:3797 build/trans_presets.java:3803
+#: build/trans_presets.java:3809 build/trans_presets.java:3814
+#: build/trans_presets.java:3820 build/trans_presets.java:3830
+#: build/trans_presets.java:3836 build/trans_presets.java:3842
+#: build/trans_presets.java:3848 build/trans_presets.java:3855
+#: build/trans_presets.java:3862 build/trans_presets.java:3868
+#: build/trans_presets.java:3874 build/trans_presets.java:3881
+#: build/trans_presets.java:3887 build/trans_presets.java:3892
+#: build/trans_presets.java:3899 build/trans_presets.java:3906
+#: build/trans_presets.java:3912 build/trans_presets.java:3921
+#: build/trans_presets.java:3929 build/trans_presets.java:3935
+#: build/trans_presets.java:3941 build/trans_presets.java:3948
+#: build/trans_presets.java:3956 build/trans_presets.java:3962
+#: build/trans_presets.java:3969 build/trans_presets.java:3975
+#: build/trans_presets.java:3981 build/trans_presets.java:3987
+#: build/trans_presets.java:3993 build/trans_presets.java:4040
+#: build/trans_presets.java:4054 build/trans_presets.java:4073
+#: build/trans_presets.java:4087 build/trans_presets.java:4110
 msgid "Name"
 msgstr "Name"
@@ -9454,5 +9415,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:138
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
 msgid "Advanced"
@@ -10412,15 +10373,40 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
-#: build/specialmessages.java:71 build/trans_presets.java:431
-#: build/trans_presets.java:726 build/trans_presets.java:735
-#: build/trans_presets.java:1127 build/trans_presets.java:1406
-#: build/trans_presets.java:1518 build/trans_presets.java:2255
-#: build/trans_presets.java:2740 build/trans_presets.java:2749
-#: build/trans_presets.java:2909 build/trans_presets.java:3025
-#: build/trans_presets.java:3035 build/trans_presets.java:3766
-#: build/trans_presets.java:3776 build/trans_presets.java:3785
+#: build/specialmessages.java:71 build/trans_presets.java:438
+#: build/trans_presets.java:733 build/trans_presets.java:742
+#: build/trans_presets.java:1134 build/trans_presets.java:1413
+#: build/trans_presets.java:1525 build/trans_presets.java:2262
+#: build/trans_presets.java:2747 build/trans_presets.java:2756
+#: build/trans_presets.java:2916 build/trans_presets.java:3032
+#: build/trans_presets.java:3042 build/trans_presets.java:3773
+#: build/trans_presets.java:3783 build/trans_presets.java:3792
 msgid "Type"
 msgstr "Typ"
 
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural" display value
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Horse" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -10432,22 +10418,21 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:281
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:408
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:169
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:33
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:181
-#: build/trans_presets.java:404 build/trans_presets.java:405
-#: build/trans_presets.java:406 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:409
-#: build/trans_presets.java:410 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:413
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:496 build/trans_presets.java:527
-#: build/trans_presets.java:572 build/trans_presets.java:704
-#: build/trans_presets.java:726 build/trans_presets.java:1338
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2171
-#: build/trans_presets.java:2505 build/trans_presets.java:2506
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:411 build/trans_presets.java:412
+#: build/trans_presets.java:413 build/trans_presets.java:414
+#: build/trans_presets.java:415 build/trans_presets.java:416
+#: build/trans_presets.java:417 build/trans_presets.java:418
+#: build/trans_presets.java:419 build/trans_presets.java:420
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:534
+#: build/trans_presets.java:579 build/trans_presets.java:711
+#: build/trans_presets.java:733 build/trans_presets.java:1345
+#: build/trans_presets.java:1418 build/trans_presets.java:1419
+#: build/trans_presets.java:1420 build/trans_presets.java:2178
+#: build/trans_presets.java:2512 build/trans_presets.java:2513
+#: build/trans_presets.java:2514
 msgid "unknown"
 msgstr "unbekannt"
@@ -11088,5 +11073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:957
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:952
 msgid "Launch a file chooser to select a file"
 msgstr "Auswahldialog für Datei öffnen"
@@ -11116,5 +11101,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
 msgid "No"
 msgstr "Nein"
@@ -11360,21 +11345,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:669
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:86
-#: build/trans_presets.java:90 build/trans_presets.java:108
-#: build/trans_presets.java:128 build/trans_presets.java:148
-#: build/trans_presets.java:170 build/trans_presets.java:188
-#: build/trans_presets.java:210 build/trans_presets.java:231
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:295 build/trans_presets.java:314
-#: build/trans_presets.java:335 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:454 build/trans_presets.java:469
-#: build/trans_presets.java:493 build/trans_presets.java:531
-#: build/trans_presets.java:551 build/trans_presets.java:573
-#: build/trans_presets.java:596 build/trans_presets.java:620
-#: build/trans_presets.java:639 build/trans_presets.java:659
-#: build/trans_presets.java:1001 build/trans_presets.java:1009
-#: build/trans_presets.java:1017 build/trans_presets.java:1025
-#: build/trans_presets.java:1036 build/trans_presets.java:1313
+#: build/trans_presets.java:97 build/trans_presets.java:115
+#: build/trans_presets.java:135 build/trans_presets.java:155
+#: build/trans_presets.java:177 build/trans_presets.java:195
+#: build/trans_presets.java:217 build/trans_presets.java:238
+#: build/trans_presets.java:264 build/trans_presets.java:283
+#: build/trans_presets.java:302 build/trans_presets.java:321
+#: build/trans_presets.java:342 build/trans_presets.java:376
+#: build/trans_presets.java:396 build/trans_presets.java:446
+#: build/trans_presets.java:461 build/trans_presets.java:476
+#: build/trans_presets.java:500 build/trans_presets.java:538
+#: build/trans_presets.java:558 build/trans_presets.java:580
+#: build/trans_presets.java:603 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:666
+#: build/trans_presets.java:1008 build/trans_presets.java:1016
+#: build/trans_presets.java:1024 build/trans_presets.java:1032
+#: build/trans_presets.java:1043 build/trans_presets.java:1320
 msgid "Layer"
 msgstr "Ebene"
@@ -11394,5 +11378,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:493
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502
 msgid "Upload"
 msgstr "Hochladen"
@@ -11414,7 +11398,6 @@
 msgstr "Initialisiere Relationen zum Aktualisieren ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:245
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:215
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -11422,5 +11405,5 @@
 msgstr "Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:127
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
@@ -11428,14 +11411,14 @@
 "Änderungssatz verwendet wird"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:488
 msgid "Tags of new changeset"
 msgstr "Merkmale des neuen Änderungssatzes"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Merkmale im Änderungssatz nutzen, zu dem hochgeladen wird"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:135
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
@@ -11443,35 +11426,35 @@
 "hinzugefügt werden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:139
 msgid "Configure advanced settings"
 msgstr "Erweiterte Einstellungen konfigurieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:495
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:180
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:504
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Zu ''{0}'' hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369
 msgid "Upload Changes"
 msgstr "Änderungen hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
 msgid "Upload the changed primitives"
 msgstr "Geänderte Objekte hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:380
 msgid "Please revise upload comment"
 msgstr "Bitte den Kommentar überdenken"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:381
 msgid "Revise"
 msgstr "Überarbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:381
 msgid "Continue as is"
 msgstr "Trotzdem fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
 msgid ""
 "Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -11488,34 +11471,34 @@
 "Arbeit vieler anderer Nutzer."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:398
 msgid "Return to the previous dialog to enter a more descriptive comment"
 msgstr ""
 "Zum vorherigen Dialog zurückkehren um eine bessere Beschreibung einzugeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:399
 msgid "Cancel and return to the previous dialog"
 msgstr "Abbrechen und zum vorherigen Dialog zurückkehren"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:391
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:400
 msgid "Ignore this hint and upload anyway"
 msgstr "Hinweis ignorieren und Hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:394
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:403
 msgid "Do not show this message again"
 msgstr "Diese Meldung nicht mehr anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411
 msgid "Please enter a valid chunk size first"
 msgstr "Bitte geben Sie zuerst eine zulässige Blockgröße an."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:412
 msgid "Illegal chunk size"
 msgstr "Ungültge Blockgröße"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:439
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
 msgid "Cancel the upload and resume editing"
 msgstr "Hochladen abbrechend und Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:490
 #, java-format
 msgid "Tags of changeset {0}"
@@ -11894,5 +11877,5 @@
 #: ../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:437
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
@@ -11915,5 +11898,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4090
 msgid "Description"
 msgstr "Beschreibung"
@@ -12326,51 +12309,41 @@
 msgstr[1] "{0} Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:287
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:289
 msgid "Auto Zoom"
 msgstr "Autom. Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:298
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:300
 msgid "Auto load tiles"
 msgstr "Kacheln automatisch laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:307
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:309
 msgid "Load Tile"
 msgstr "Kachel laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:318
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:320
 msgid "Show Tile Info"
 msgstr "Kachelinformationen anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:341
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
 msgid "Load All Tiles"
 msgstr "Alle Kacheln laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:351
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:353
 msgid "Increase zoom"
 msgstr "Zoom erhöhen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:360
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:362
 msgid "Decrease zoom"
 msgstr "Zoom reduzieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:371
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:373
 msgid "Snap to tile size"
 msgstr "An Kachelgröße anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:389
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:305
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:391
 msgid "Flush Tile Cache"
 msgstr "Kachel-Zwischenspeicher leeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:859
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:876
 msgid "image "
 msgstr "Bild "
@@ -12380,6 +12353,5 @@
 msgstr "Keine Fehler gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:127
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:131
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -12388,23 +12360,19 @@
 "ungültiges Format hat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:129
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:133
 msgid "(deactivated)"
 msgstr "(deaktiviert)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:182
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:186
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:184
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:188
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:224
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:228
 #, java-format
 msgid ""
@@ -12419,21 +12387,17 @@
 "heruntergeladen werden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:232
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:236
 msgid "Yes, fetch images"
 msgstr "Ja, Kacheln herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:238
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:232
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:242
 msgid "Invalid URL?"
 msgstr "Ungültige URL?"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:501
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:510
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:508
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:517
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12442,62 +12406,50 @@
 "die Auflösung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:520
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:519
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:529
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:534
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:543
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:556
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:565
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:587
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:596
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:592
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:601
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:616
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:615
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:625
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:621
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:620
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:630
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:632
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:631
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:641
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:633
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:642
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:665
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:674
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:679
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:678
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:688
 msgid "Set WMS Bookmark"
 msgstr "WMS-Lesezeichen erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:690
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:699
 msgid "Automatic downloading"
 msgstr "Automatisches Laden"
@@ -13037,5 +12989,5 @@
 msgstr "Ungültiges Strichelungsmuster - mindestens ein Wert muss positiv sein"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:105
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:98
 #, java-format
 msgid ""
@@ -13045,5 +12997,5 @@
 "Fehlermeldung war: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:108
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -13052,5 +13004,5 @@
 msgstr "Warnung: Mappaint-Stile in ''{0}'' enthalten Fehler: [{1}:{2}] {3}"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:111
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
@@ -13746,5 +13698,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:78
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:77
 msgid "Unnamed WMS Layer"
 msgstr "Unbenannte WMS-Ebene"
@@ -13752,21 +13703,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:82
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:162
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:81
 msgid "Menu Name"
 msgstr "Menüname"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:84
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:83
 msgid "Service URL"
 msgstr "Service-URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:89
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:88
 msgid "Get Layers"
 msgstr "Ebenen abfragen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:127
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:126
 msgid ""
 "That layer does not support any of JOSM's projections,\n"
@@ -13782,9 +13728,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:248
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:266
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:128
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:164
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:225
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:247
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:265
 msgid "WMS Error"
 msgstr "WMS-Fehler"
@@ -13792,31 +13733,24 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:154
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:162
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:153
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:161
 msgid "Show Bounds"
 msgstr "Zeige Bereichsgrenzen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:164
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:163
 msgid "No bounding box was found for this layer."
 msgstr "Für diese Ebene wurden keine Bereichsgrenzen gefunden."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:172
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:171
 msgid "WMS URL"
 msgstr "WMS-URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:225
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:224
 msgid "Could not parse WMS layer list."
 msgstr "Konnte die Liste der WMS-Ebenen nicht auswerten."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:247
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:246
 msgid "Invalid service URL."
 msgstr "Ungültige Service-URL."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:265
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/AddWMSLayerPanel.java:264
 msgid "Could not retrieve WMS layer list."
 msgstr "Konnte die Liste der WMS-Ebenen nicht abfragen."
@@ -14053,5 +13987,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:98
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:78
 #, java-format
 msgid "Choose a color for {0}"
@@ -14091,5 +14024,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:118
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:103
 msgid "None"
 msgstr "Keine"
@@ -14124,5 +14056,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1405
 msgid "Car"
 msgstr "Auto"
@@ -14146,13 +14078,13 @@
 #. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:406 build/trans_presets.java:525
-#: build/trans_presets.java:803 build/trans_presets.java:822
-#: build/trans_presets.java:836 build/trans_presets.java:858
-#: build/trans_presets.java:895 build/trans_presets.java:908
-#: build/trans_presets.java:920 build/trans_presets.java:932
-#: build/trans_presets.java:944 build/trans_presets.java:956
-#: build/trans_presets.java:966 build/trans_presets.java:975
-#: build/trans_presets.java:984 build/trans_presets.java:1544
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:413 build/trans_presets.java:532
+#: build/trans_presets.java:810 build/trans_presets.java:829
+#: build/trans_presets.java:843 build/trans_presets.java:865
+#: build/trans_presets.java:902 build/trans_presets.java:915
+#: build/trans_presets.java:927 build/trans_presets.java:939
+#: build/trans_presets.java:951 build/trans_presets.java:963
+#: build/trans_presets.java:973 build/trans_presets.java:982
+#: build/trans_presets.java:991 build/trans_presets.java:1551
+#: build/trans_presets.java:1624
 msgid "Bicycle"
 msgstr "Fahrrad"
@@ -14187,12 +14119,12 @@
 #. item "Barriers/Sally Port" check "Foot"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:407 build/trans_presets.java:524
-#: build/trans_presets.java:802 build/trans_presets.java:821
-#: build/trans_presets.java:835 build/trans_presets.java:857
-#: build/trans_presets.java:894 build/trans_presets.java:907
-#: build/trans_presets.java:919 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:965 build/trans_presets.java:974
-#: build/trans_presets.java:983
+#: build/trans_presets.java:414 build/trans_presets.java:531
+#: build/trans_presets.java:809 build/trans_presets.java:828
+#: build/trans_presets.java:842 build/trans_presets.java:864
+#: build/trans_presets.java:901 build/trans_presets.java:914
+#: build/trans_presets.java:926 build/trans_presets.java:938
+#: build/trans_presets.java:950 build/trans_presets.java:962
+#: build/trans_presets.java:972 build/trans_presets.java:981
+#: build/trans_presets.java:990
 msgid "Foot"
 msgstr "Zu Fuß"
@@ -14425,32 +14357,26 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:98
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:78
 msgid "imagery fade"
 msgstr "Bildebene verblassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:109
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:89
 msgid "Fade Color: "
 msgstr "Verblassungsfarbe: "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:113
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:93
 msgid "Fade amount: "
 msgstr "Verblassungsstärke: "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:119
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:104
 msgid "Soft"
 msgstr "Schwach"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:120
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:105
 msgid "Strong"
 msgstr "Stark"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:121
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:106
 msgid "Sharpen (requires layer re-add): "
-msgstr "Bild schärfen (erfordert neues Hinzufügen der Ebene): "
+msgstr "Bild schärfen (danach Ebene neu hinzufügen): "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:126
@@ -14459,45 +14385,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:153
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:123
 msgid "Downloader:"
 msgstr "Herunterladeprogramm:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:159
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:129
 msgid "Overlap tiles"
 msgstr "Kacheln überlappen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:160
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:130
 msgid "% of east:"
 msgstr "Ost-West (%):"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:161
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:131
 msgid "% of north:"
 msgstr "Nord-Süd (%):"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:176
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:146
 msgid "Simultaneous connections"
 msgstr "Simultane Verbindungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:192
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:161
 msgid "Auto zoom by default: "
 msgstr "Automatisch zoomen: "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:196
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:165
 msgid "Autoload tiles by default: "
 msgstr "Kacheln automatisch laden: "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:200
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:169
 msgid "Min zoom lvl: "
 msgstr "Min. Zoomstufe: "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:204
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:173
 msgid "Max zoom lvl: "
 msgstr "Max. Zoomstufe: "
@@ -14508,60 +14425,50 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:227
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:198
 msgid "Common Settings"
 msgstr "Allgemeine Einstellungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:228
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:199
 msgid "WMS Settings"
 msgstr "WMS-Einstellungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:229
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:200
 msgid "TMS Settings"
 msgstr "TMS-Einstellungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:237
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:208
 msgid "Imagery Preferences"
 msgstr "Einstellungen für Hintergrundebenen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:237
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:208
 msgid "Modify list of imagery layers displayed in the Imagery menu"
-msgstr "Ändern der Liste der bildlichen Darstellungsebenen im Imagery Menü"
+msgstr ""
+"Liste der Hintergrundebenen bearbeiten, die im \"Hintergrund\"-Menü "
+"angezeigt werden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:244
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:214
 msgid "Imagery providers"
 msgstr "Bilddienste"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:246
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:216
 msgid "Offset bookmarks"
 msgstr "Versatz-Lesezeichen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:388
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:85
 msgid "Add Imagery URL"
 msgstr "Bilddienst-URL hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:412
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:108
 msgid "Copy Selected Default(s)"
 msgstr "Ausgewählte Standardwerte kopieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:421
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:117
 msgid "Please select at least one row to copy."
 msgstr "Bitte wählen Sie mindestens eine Zeile, die kopiert werden soll."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:162
 msgid "Imagery URL"
 msgstr "Bilddienst-URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:162
 msgctxt "layer"
 msgid "Zoom"
@@ -14569,15 +14476,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:546
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:239
 msgid "Menu Name (Default)"
 msgstr "Menüname (Standard)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:546
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:239
 msgid "Imagery URL (Default)"
 msgstr "Bilddienst-URL (Standard)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:589
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:282
 #, java-format
 msgid "EULA license URL not available: {0}"
@@ -14585,5 +14489,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:603
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java:297
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
@@ -14591,5 +14494,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:669
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/OffsetBookmarksPanel.java:86
 msgid "Projection"
 msgstr "Projektion"
@@ -14717,9 +14619,9 @@
 msgstr "Integrierte Standardsymbole aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Used style"
 msgstr "Benutzter Stil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:75
 msgid "Map Paint Styles"
 msgstr "MapPaint Stile"
@@ -15073,42 +14975,34 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:47
-#, fuzzy
 msgid "Load data from API"
-msgstr "Daten vom API herunterladen"
+msgstr "Daten über API laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:48
-#, fuzzy
 msgid "Import data from URL"
 msgstr "Daten von URL importieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:49
-#, fuzzy
 msgid "Load imagery layers"
-msgstr "Hintergrundebenen laden"
+msgstr "Hintergrund-Ebenen laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:50
-#, fuzzy
 msgid "Create new objects"
-msgstr "Erstelle neue Objekte"
+msgstr "Neue Objekte erstellen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:51
-#, fuzzy
 msgid "Change the selection"
 msgstr "Auswahl ändern"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:52
-#, fuzzy
 msgid "Change the viewport"
-msgstr "Ansicht wechseln"
+msgstr "Ansicht ändern"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:53
-#, fuzzy
 msgid "Read protocol version"
-msgstr "Protokollversion lesen"
+msgstr "Ansicht ändern"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54
-#, fuzzy
 msgid "Confirm all Remote Control actions manually"
-msgstr "Alle Fernsteueraktionen manuell bestätigen"
+msgstr "Alle Fernsteuerungs-Aktionen manuell bestätigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58
@@ -15117,7 +15011,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58
-#, fuzzy
 msgid "Settings for the remote control feature."
-msgstr "Einstellungen für die Fernsteuerungs-Funktion."
+msgstr "Einstellungen für Fernsteuerungs-Funktion."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:60
@@ -15138,5 +15031,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
-#, fuzzy
 msgid ""
 "JOSM will always listen at port 8111 on localhost.This port is not "
@@ -15144,7 +15036,6 @@
 "JOSM."
 msgstr ""
-"JOSM wird immer auf dem lokalen Port 8111 lauschen. Dieser Port kann nicht "
-"angepasst werden, da er von externen Anwendungen zum Zugriff auf JOSM "
-"genutzt wird."
+"JOSM lauscht immer am lokalen Port 8111. Dieser Port kann nicht geändert "
+"werden, da externe Anwendungen darüber auf JOSM zugreifen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15186,87 +15077,87 @@
 msgstr "Tastaturkürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:125
 msgid "Active styles:"
 msgstr "Aktive Stile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:146
 #, java-format
 msgid "Available styles (from {0}):"
 msgstr "Verfügbare Stile (von {0}):"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:175
 msgid "Icon paths:"
 msgstr "Icon-Verzeichnisse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:429
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:424
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Kurzbeschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:429
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:424
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:426
 #, java-format
 msgid "Author: {0}"
 msgstr "Autor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:429
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Webseite: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:440
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
 #, java-format
 msgid "Version: {0}"
 msgstr "Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:453
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:645
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:448
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
 msgid "New"
 msgstr "Neu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:454
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
 msgid "Add a filename or an URL of an active style"
 msgstr "Füge einen Dateinamen oder eine URL für einen aktiven Stil hinzu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:469
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:464
 msgid "Remove the selected styles from the list of active styles"
 msgstr "Entfernt die ausgewählten Stile von der Liste der aktiven Stile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 msgid "Edit the filename or URL for the selected active style"
 msgstr "Dateiname oder URL für den ausgewählten Stil ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Add the selected available styles to the list of active styles"
 msgstr "Ausgewählte verfügbare Stile zu der Liste der aktiven Stile hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:535
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
 msgstr "Liste der verfügbaren Stile von ''{0}'' laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:646
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:641
 msgid "Add a new icon path"
 msgstr "Neuen Pfad für Symbole hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:659
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:654
 msgid "Remove the selected icon paths"
 msgstr "Ausgewählte Pfade für Symbole entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
 msgid "Edit the selected icon path"
 msgstr "Ausgewählten Pfad für Symbole ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:720
 #, java-format
 msgid "Loading style sources from ''{0}''"
 msgstr "Verfügbare Stile von ''{0}'' laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:747
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:742
 #, java-format
 msgid ""
@@ -15277,9 +15168,9 @@
 "<br><br>Details: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:769
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:764
 msgid "Internal style"
 msgstr "Interner Stil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:770
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
 msgid "Internal style to be used as base for runtime switchable overlay styles"
 msgstr ""
@@ -15287,6 +15178,6 @@
 "Ergänzungsstile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:791
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:823
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:786
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:818
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -15295,10 +15186,10 @@
 "Der Eintrag ist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid "Warning: Could not read tagging preset source: {0}"
 msgstr "Warnung: Konnte Objektvorlage nicht laden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:65
 #, java-format
 msgid ""
@@ -15310,10 +15201,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:85
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "Objektvorlagenquelle konnte nicht gelesen werden {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
 #, java-format
 msgid ""
@@ -15326,5 +15217,5 @@
 "[{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:95
 #, java-format
 msgid ""
@@ -15336,5 +15227,5 @@
 "table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
 #, java-format
 msgid ""
@@ -15346,5 +15237,5 @@
 "</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:105
 #, java-format
 msgid ""
@@ -15360,5 +15251,5 @@
 msgstr "Objektvorlagenmenü sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:153
 msgid "Tagging Presets"
 msgstr "Objektvorlagen"
@@ -15401,46 +15292,46 @@
 msgstr "Die Elemente auf der Werkzeugleiste anpassen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:80
 msgid "Use ignore list."
 msgstr "Ignorierliste verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:81
 msgid "Use the ignore list to suppress warnings."
 msgstr "Ignorierliste zum Unterdrücken von Warnungen verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:84
 msgid "Use error layer."
 msgstr "Fehlerebene verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:85
 msgid "Use the error layer to display problematic elements."
 msgstr "Fehlerebene verwenden, um problematische Elemente anzuzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:88
 msgid "Show informational level."
 msgstr "Informationsebene anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:89
 msgid "Show the informational tests."
 msgstr "Informatorische Tests anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:92
 msgid "Show informational level on upload."
 msgstr "Unwichtige Warnungen beim Hochladen anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:93
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 "Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:106
 msgid "On demand"
 msgstr "Auf Anforderung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:107
 msgid "On upload"
 msgstr "Beim Hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:117
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15449,5 +15340,5 @@
 "Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:118
 msgid "Data validator"
 msgstr "Datenprüfungs-Plugin"
@@ -17175,11 +17066,8 @@
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/io/WMSLayerExporter.java:11
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/io/WMSLayerImporter.java:11
 msgid "WMS Files (*.wms)"
 msgstr "WMS-Dateien (*.wms)"
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:104
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSGrabber.java:104
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:103
 #, java-format
 msgid ""
@@ -17189,6 +17077,5 @@
 "Achtung: Die Adresse \"{0}\" des WMS-Dienstes enthält kein ''&'' oder ''?''."
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:105
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSGrabber.java:105
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:104
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -17198,12 +17085,10 @@
 "Einstellungen."
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:106
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSGrabber.java:106
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:105
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Achtung: Die vollständige URL lautet \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:128
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSGrabber.java:127
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:127
 #, java-format
 msgid ""
@@ -17219,5 +17104,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java:23
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load an imagery layer from the following "
@@ -17226,5 +17110,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java:48
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryRemoteHandler.java:48
 msgid "Remote imagery"
 msgstr "Hintergrund-Fernsteuerung"
@@ -17320,7 +17203,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
-#, fuzzy, java-format
+#, java-format
 msgid "replaced by new {0} plugin"
-msgstr "Durch Plugin {0} ersetzt"
+msgstr "ersetzt durch das neue Plugin {0}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:186
@@ -18337,5 +18220,5 @@
 #. item "Ways/Path" combo "Visibility"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:125
-#: build/trans_presets.java:517
+#: build/trans_presets.java:524
 msgid "Visibility"
 msgstr "Sichtbarkeit"
@@ -18534,5 +18417,5 @@
 #. group "Highways/Streets"
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:71
-#: build/trans_presets.java:80
+#: build/trans_presets.java:87
 msgid "Streets"
 msgstr "Straßen"
@@ -18585,5 +18468,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
-#: build/trans_presets.java:3991
+#: build/trans_presets.java:3998
 msgid "Addresses"
 msgstr "Adressen"
@@ -18603,5 +18486,5 @@
 #. item "Places/Country"
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3640
 msgid "Country"
 msgstr "Staat"
@@ -18611,5 +18494,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: build/trans_presets.java:3662
+#: build/trans_presets.java:3669
 msgid "City"
 msgstr "Großstadt"
@@ -18630,5 +18513,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: build/trans_presets.java:672
+#: build/trans_presets.java:679
 msgid "Number"
 msgstr "Nummer"
@@ -18781,5 +18664,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1203
-#: build/trans_presets.java:4005
+#: build/trans_presets.java:4012
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -19243,5 +19126,4 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:257
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Erstelle ein Gebäude"
@@ -19303,5 +19185,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 msgid "Buildings"
 msgstr "Gebäude"
@@ -19315,21 +19196,5 @@
 msgstr "Adressen eingeben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
-msgid "Grab buildings"
-msgstr "Gebäude aufnehmen"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
-msgid "Extract building on click (vector images only)"
-msgstr "Gebäude durch Klicken extrahieren (nur Vektorbilder)"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
-msgid ""
-"This feature requires (at least) one special cadastre\n"
-"Buildings layer and an OSM data layer."
-msgstr ""
-"Diese Funktion erfordert (mindestens) eine spezielle cadastre\n"
-"Gebäude-Ebene und eine OSM-Datenebene."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:101
 #, java-format
 msgid ""
@@ -19345,10 +19210,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:106
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439
 msgid "Select Feuille"
 msgstr "Feuille auswählen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:150
 msgid ""
 "Error loading file.\n"
@@ -19396,6 +19261,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:51
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:62
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:216
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:171
@@ -19499,4 +19362,5 @@
 "Keine Relation für Adressen nutzen (sondern \"addr:street\" an Elementen)."
 
+#. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -19538,5 +19402,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:2909 build/trans_style.java:812
+#: build/trans_presets.java:2916 build/trans_style.java:812
 #: build/trans_style.java:825 build/trans_style.java:837
 #: build/trans_style.java:842 build/trans_style.java:2900
@@ -19819,5 +19683,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:56
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:31
 msgid "Contacting WMS Server..."
 msgstr "Verbinde zu WMS-Server..."
@@ -19870,4 +19734,11 @@
 "Benutze das normale Cadastre-Menü."
 
+#. set raster image commune bounding box based on current view (before adjustment)
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:47
+msgid ""
+"This commune is not vectorized.\n"
+"Please use the other menu entry to georeference a \"Plan image\""
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
@@ -19877,20 +19748,4 @@
 msgid "Only on vectorized layers"
 msgstr "Nur für vektorisierte Ebenen."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
-msgid "Grab building layer only"
-msgstr "Nur Gebäude-Ebene holen"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:31
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:96
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the current projection to one of the cadastre\n"
-"projections and retry"
-msgstr ""
-"Um das Kataster-WMS-Plugin zu aktivieren, muss\n"
-"die derzeitige Projektion in eine von Cadastre\n"
-"unterstützte Projektion geändert werden."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
@@ -19904,4 +19759,15 @@
 msgstr "Kataster: {0}"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:96
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
+msgstr ""
+"Um das Kataster-WMS-Plugin zu aktivieren, muss\n"
+"die derzeitige Projektion in eine von Cadastre\n"
+"unterstützte Projektion geändert werden."
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:55
 msgid "Grab non-georeferenced image"
@@ -20093,28 +19959,28 @@
 "Bitte eine auswählen und erneut versuchen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:228
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:230
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:231
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:233
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:234
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:460
 #, java-format
 msgid ""
@@ -20126,9 +19992,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:461
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -20137,5 +20003,5 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
@@ -20353,5 +20219,5 @@
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:217
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:244
 msgid "Name:"
 msgstr "Name:"
@@ -20533,90 +20399,31 @@
 msgstr "GPX"
 
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:39
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:38
 msgid "Adjust imagery"
 msgstr "Hintergrund-Bildebene anpassen"
 
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:40
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:39
 msgid "Adjust the position of the selected imagery layer"
 msgstr "Position der gewählten Hintergrund-Bildebene anpassen"
 
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:161
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:144
 msgid "Please select the imagery layer to adjust."
 msgstr "Bitte wählen Sie die anzupassende Hintergrund-Bildebene."
 
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:166
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:149
 msgid "Select imagery layer"
 msgstr "Hintergrund-Bildebene wählen"
 
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:167
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
 msgid "Start adjusting"
 msgstr "Justierung starten"
 
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:186
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:169
 msgid "There are currently no imagery layer to adjust."
 msgstr "Momentan sind keine Hintergrund-Bildebenen zur Anpassung vorhanden."
 
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java:187
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:170
 msgid "No layers to adjust"
 msgstr "Keine Ebenen zum Justieren"
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java:133
-msgid "(save current)"
-msgstr "(Aktuelles speichern)"
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java:140
-msgid "Add offset bookmark"
-msgstr "Versatz-Lesezeichen hinzufügen"
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:147
-msgid "Could not initialize remote control."
-msgstr "Fernsteuerung konnte nicht initialisiert werden."
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:152
-#, java-format
-msgid "Remote control plugin is not compatible with {0}."
-msgstr "Fernsteuerplugin ist nicht kompatibel mit {0}."
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:158
-#, java-format
-msgid ""
-"{0} will work but remote control for this plugin is disabled.\n"
-"You should update the plugins."
-msgstr ""
-"{0} wird funktionieren, aber die Fernsteuerung für das Plugin wurde "
-"deaktiviert.\n"
-"Die Plugins sollten aktualisiert werden."
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:161
-#, java-format
-msgid ""
-"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-"internal version {5}.\n"
-"If updating the plugins does not help report a bug for \"{0}\"."
-msgstr ""
-"Aktuelle Version von ''{1}'': {2}, interne Version {3}- Benötigte Version "
-"{4}, interne Version {5}.\n"
-"Falls Aktualisieren der Plugins nicht hilft, bitte einen Fehler für ''{0}'' "
-"melden."
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java:173
-#, java-format
-msgid "{0}: Problem with remote control"
-msgstr "{0}: Problem mit Fernsteuerung"
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java:99
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr "Fernsteuerung erlauben (erfordert remotecontrol-Plugin)"
-
-#: ../plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/GeorefImage.java:79
-msgid "Exception occurred"
-msgstr "Fehler"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -21971,5 +21778,5 @@
 #. group "Public Transport"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1574
 msgid "Public Transport"
 msgstr "Öffentliche Verkehrsmittel"
@@ -22016,5 +21823,5 @@
 #. group "Waypoints"
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:665
+#: build/trans_presets.java:672
 msgid "Waypoints"
 msgstr "Wegpunkte"
@@ -22261,5 +22068,5 @@
 msgstr "Unnötige Knoten aus Flächen entfernen"
 
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:272
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:280
 #, java-format
 msgid "Simplify Area (remove {0} node)"
@@ -22267,44 +22074,4 @@
 msgstr[0] "Fläche vereinfachen ({0} Knoten löschen)"
 msgstr[1] "Fläche vereinfachen ({0} Knoten löschen)"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:97
-msgid "No colour"
-msgstr "Keine Farbe"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:108
-msgid "White"
-msgstr "Weiss"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:119
-msgid "Red"
-msgstr "Rot"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:130
-msgid "Orange"
-msgstr "Orange"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:141
-msgid "Amber"
-msgstr "Bernstein"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:152
-msgid "Yellow"
-msgstr "Gelb"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:163
-msgid "Green"
-msgstr "Grün"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:174
-msgid "Blue"
-msgstr "Blau"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:185
-msgid "Violet"
-msgstr "Violett"
-
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java:196
-msgid "Black"
-msgstr "Schwarz"
 
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:58
@@ -22585,5 +22352,5 @@
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:210
-#: ../plugins/terracer/src/terracer/TerracerAction.java:423
+#: ../plugins/terracer/src/terracer/TerracerAction.java:431
 msgid "Terrace"
 msgstr "Abteilen"
@@ -22722,5 +22489,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:238
 msgid "Digital sign selected Tags, if you believe they are correct."
-msgstr ""
+msgstr "Ausgewählte Tags digital signieren, wenn Sie sie für korrekt halten."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:242
@@ -23783,47 +23550,47 @@
 msgstr "Bitte wechseln sie zum Editor und wählen einen Weg aus"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69
 msgid "Undelete object..."
 msgstr "Objekt wiederherstellen..."
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69
 msgid "Undelete object by id"
 msgstr "Objekt mittels ID wiederherstellen"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:75
 msgid "Select if the data should be added into a new layer"
 msgstr "Auswählen, ob die Daten in eine neue Ebene gespeichert werden sollen"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:94
 msgid "Enter the ID of the object that should be undeleted"
 msgstr "ID des wiederherzustellenden Objekts eingeben"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
 msgid "Undelete Object"
 msgstr "Objekt wiederherstellen"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107
 msgid "Undelete object"
 msgstr "Objekt wiederherstellen"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:112
 msgid "Start undeleting"
 msgstr "Wiederherstellen starten"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:113
 msgid "Close dialog and cancel"
 msgstr "Dialog schließen und abbrechen"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:169
 #, java-format
 msgid "Will get {0}"
 msgstr "Erhalte {0}"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:173
 #, java-format
 msgid "Looking for {0}"
 msgstr "Suche nach {0}"
 
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:175
 #, java-format
 msgid "Found {0}"
@@ -23847,12 +23614,10 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:48
 #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:49
-#, fuzzy
 msgid "Select Way Nodes"
-msgstr "Auswählen und schließen"
+msgstr "Wähle Streckenknoten"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:48
-#, fuzzy
 msgid "Select all nodes of a selected way."
-msgstr "Wählen Sie die Elemente aller ausgewählten Relationen aus"
+msgstr "Alle Knoten des gewählten Weges auswählen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
@@ -24685,16 +24450,11 @@
 msgstr "Visualisiert Routeninformationen als Routengraph."
 
-#. Plugin imagery
+#. Plugin imageryadjust
 #: build/trans_plugins.java:42
-msgid "Experimental union of SlippyMap plugin and WMSPlugin"
-msgstr "Experimentelle Vereinigung der Plugins \"SlippyMap\" und \"WMSPlugin\""
-
-#. Plugin imageryadjust
+msgid "WMSPlugin-style imagery adjustment mapmode"
+msgstr "Bildjustierung im Kartenmodus-Stil des WMS-Plugins"
+
+#. Plugin ImageWayPoint
 #: build/trans_plugins.java:44
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
-#. Plugin ImageWayPoint
-#: build/trans_plugins.java:46
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -24707,25 +24467,25 @@
 
 #. Plugin ImportImagePlugin
-#: build/trans_plugins.java:48 build/trans_plugins.java:50
+#: build/trans_plugins.java:46 build/trans_plugins.java:48
 msgid "Plugin for importing spatial referenced images"
 msgstr "Plugin zum Import georeferenzierter Bilder"
 
 #. Plugin importvec
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:50
 msgid "Import vector graphics (SVG)"
 msgstr "Vektorgrafiken (SVG) importieren"
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:52
 msgid "A helper for IRS satellite adjustment."
 msgstr "Eine Hilfe zum Ausrichten von IRS-Satellitenbildern."
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:54
 msgid "Helps vectorizing WMS images."
 msgstr "Hilfe beim Vektorisieren von WMS-Bildern."
 
 #. Plugin livegps
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:56
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -24736,5 +24496,5 @@
 #. File ../plugins/mapdust/build.xml had no data
 #. Plugin measurement
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:59
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -24747,15 +24507,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid "Simply convert an area to a multipolygon."
 msgstr "Ein Gebiet einfach in ein Multipolygon umwandeln."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -24766,5 +24526,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:67
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -24777,15 +24537,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:69
 msgid "extended options for editing opening_hours"
 msgstr "erweiterte Optionen um Öffnungszeiten zu bearbeiten"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:71
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importiert Berichte von OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:73
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -24795,17 +24555,17 @@
 
 #. Plugin osmarender
+#: build/trans_plugins.java:75
+msgid ""
+"Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr ""
+"Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen."
+
+#. Plugin pdfimport
 #: build/trans_plugins.java:77
-msgid ""
-"Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr ""
-"Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen."
-
-#. Plugin pdfimport
-#: build/trans_plugins.java:79
 msgid "Import PDF file and convert to ways."
 msgstr "PDF-Datei importieren und in Wege konvertieren."
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:79
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -24816,5 +24576,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:81
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -24825,10 +24585,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:83
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:85
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -24838,20 +24598,20 @@
 
 #. Plugin restart
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:87
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr "Fügt &quot;JOSM neustarten&quot; in das Datei-Menü ein."
 
 #. Plugin reverter
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:89
 msgid "Plugin for reverting changesets"
 msgstr "Plugin zum Umkehren von Änderungssätzen"
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:91
 msgid "Use rgis.spb.ru image as overlay"
 msgstr "Bilder von rgis.spb.ru als Überlagerung nutzen"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:93
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -24865,5 +24625,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:95
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -24874,10 +24634,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:97
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:99
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -24890,20 +24650,20 @@
 #. Plugin SeaMapEditor
 #. Plugin smed_fw
-#: build/trans_plugins.java:103 build/trans_plugins.java:105
+#: build/trans_plugins.java:101 build/trans_plugins.java:103
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr "Erstellen und Ändern von Seekarten für OpenSeaMap"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:105
 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:109
+#: build/trans_plugins.java:107
 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:111
+#: build/trans_plugins.java:109
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -24916,15 +24676,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:111
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin toms
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:113
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Seezeichen für OpenSeaMap erstellen und bearbeiten"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:115
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -24935,5 +24695,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:117
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -24944,10 +24704,10 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:119
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin zum digitalen Signieren von OSM-Daten"
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:121
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -24958,15 +24718,15 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:125
+#: build/trans_plugins.java:123
 msgid "Allows undeleting object from OSM database"
 msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen"
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:127
+#: build/trans_plugins.java:125
 msgid "Several utilities that make your life easier."
 msgstr "Diverse Werkzeuge, die das Leben einfacher machen."
 
 #. Plugin videomapping
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:127
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -24979,5 +24739,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:129
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -24989,21 +24749,21 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:131
 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:133
+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:135
-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:137
 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:139
+#: build/trans_plugins.java:137
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -25048,4 +24808,11 @@
 #. display_values: comma separated list of values to be displayed instead of the
 #. database values, order and number must be equal to values
+#. short_description: comma separated list of texts to be displayed below each
+#. display_value. (Only if it is not possible to describe
+#. the entry in 2-3 words.) Instead of comma separeted list, you can
+#. also write it in the following form:
+#. <short_description>first description</short_description>
+#. ...
+#. <short_description>last description</short_description>
 #. default: default string to display
 #. delete_if_empty: true/false
@@ -25081,5 +24848,5 @@
 #. -->
 #. group "Highways"
-#: build/trans_presets.java:79
+#: build/trans_presets.java:86
 msgid "Highways"
 msgstr "Straßen"
@@ -25090,5 +24857,5 @@
 #. </button>
 #. <button label="Motorway" hotkey="1">
-#: build/trans_presets.java:81 build/trans_surveyor.java:72
+#: build/trans_presets.java:88 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autobahn"
@@ -25097,5 +24864,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
 #. item "Highways/Streets/Motorway" label "Edit Motorway"
-#: build/trans_presets.java:84
+#: build/trans_presets.java:91
 msgid "Edit Motorway"
 msgstr "Autobahn bearbeiten"
@@ -25133,11 +24900,11 @@
 #. item "Power/Cable Distribution Cabinet" text "Reference"
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:87 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:167
-#: build/trans_presets.java:207 build/trans_presets.java:228
-#: build/trans_presets.java:1694 build/trans_presets.java:1702
-#: build/trans_presets.java:1710 build/trans_presets.java:1744
-#: build/trans_presets.java:3045 build/trans_presets.java:3061
-#: build/trans_presets.java:4081
+#: build/trans_presets.java:94 build/trans_presets.java:132
+#: build/trans_presets.java:153 build/trans_presets.java:174
+#: build/trans_presets.java:214 build/trans_presets.java:235
+#: build/trans_presets.java:1701 build/trans_presets.java:1709
+#: build/trans_presets.java:1717 build/trans_presets.java:1751
+#: build/trans_presets.java:3052 build/trans_presets.java:3068
+#: build/trans_presets.java:4088
 msgid "Reference"
 msgstr "Referenz"
@@ -25151,8 +24918,8 @@
 #. item "Highways/Streets/Secondary" combo "Lanes"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
-#: build/trans_presets.java:91 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:149
-#: build/trans_presets.java:171 build/trans_presets.java:189
-#: build/trans_presets.java:211 build/trans_presets.java:440
+#: build/trans_presets.java:98 build/trans_presets.java:116
+#: build/trans_presets.java:136 build/trans_presets.java:156
+#: build/trans_presets.java:178 build/trans_presets.java:196
+#: build/trans_presets.java:218 build/trans_presets.java:447
 msgid "Lanes"
 msgstr "Spuren"
@@ -25176,13 +24943,13 @@
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
-#: build/trans_presets.java:92 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:150
-#: build/trans_presets.java:172 build/trans_presets.java:190
-#: build/trans_presets.java:212 build/trans_presets.java:232
-#: build/trans_presets.java:258 build/trans_presets.java:337
-#: build/trans_presets.java:371 build/trans_presets.java:392
-#: build/trans_presets.java:414 build/trans_presets.java:455
-#: build/trans_presets.java:470 build/trans_presets.java:532
-#: build/trans_presets.java:552 build/trans_presets.java:1315
+#: build/trans_presets.java:99 build/trans_presets.java:117
+#: build/trans_presets.java:137 build/trans_presets.java:157
+#: build/trans_presets.java:179 build/trans_presets.java:197
+#: build/trans_presets.java:219 build/trans_presets.java:239
+#: build/trans_presets.java:265 build/trans_presets.java:344
+#: build/trans_presets.java:378 build/trans_presets.java:399
+#: build/trans_presets.java:421 build/trans_presets.java:462
+#: build/trans_presets.java:477 build/trans_presets.java:539
+#: build/trans_presets.java:559 build/trans_presets.java:1322
 msgid "Max. speed (km/h)"
 msgstr "Höchstgeschwindigkeit (km/h)"
@@ -25221,17 +24988,17 @@
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
-#: build/trans_presets.java:93 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:151
-#: build/trans_presets.java:173 build/trans_presets.java:191
-#: build/trans_presets.java:213 build/trans_presets.java:233
-#: build/trans_presets.java:250 build/trans_presets.java:270
-#: build/trans_presets.java:289 build/trans_presets.java:308
-#: build/trans_presets.java:328 build/trans_presets.java:350
-#: build/trans_presets.java:363 build/trans_presets.java:383
-#: build/trans_presets.java:401 build/trans_presets.java:434
-#: build/trans_presets.java:492 build/trans_presets.java:523
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:590 build/trans_presets.java:613
-#: build/trans_presets.java:653 build/trans_presets.java:1308
+#: build/trans_presets.java:100 build/trans_presets.java:118
+#: build/trans_presets.java:138 build/trans_presets.java:158
+#: build/trans_presets.java:180 build/trans_presets.java:198
+#: build/trans_presets.java:220 build/trans_presets.java:240
+#: build/trans_presets.java:257 build/trans_presets.java:277
+#: build/trans_presets.java:296 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:357
+#: build/trans_presets.java:370 build/trans_presets.java:390
+#: build/trans_presets.java:408 build/trans_presets.java:441
+#: build/trans_presets.java:499 build/trans_presets.java:530
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:597 build/trans_presets.java:620
+#: build/trans_presets.java:660 build/trans_presets.java:1315
 msgid "Oneway"
 msgstr "Einbahnstraße"
@@ -25272,18 +25039,18 @@
 #. </button>
 #. <button label="Bridge" hotkey="B" type="toggle">
-#: build/trans_presets.java:94 build/trans_presets.java:112
-#: build/trans_presets.java:133 build/trans_presets.java:153
-#: build/trans_presets.java:175 build/trans_presets.java:193
-#: build/trans_presets.java:214 build/trans_presets.java:234
-#: build/trans_presets.java:251 build/trans_presets.java:271
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:329 build/trans_presets.java:364
-#: build/trans_presets.java:384 build/trans_presets.java:435
-#: build/trans_presets.java:444 build/trans_presets.java:451
-#: build/trans_presets.java:487 build/trans_presets.java:518
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:591 build/trans_presets.java:614
-#: build/trans_presets.java:633 build/trans_presets.java:654
-#: build/trans_presets.java:1309 build/trans_surveyor.java:12
+#: build/trans_presets.java:101 build/trans_presets.java:119
+#: build/trans_presets.java:140 build/trans_presets.java:160
+#: build/trans_presets.java:182 build/trans_presets.java:200
+#: build/trans_presets.java:221 build/trans_presets.java:241
+#: build/trans_presets.java:258 build/trans_presets.java:278
+#: build/trans_presets.java:297 build/trans_presets.java:316
+#: build/trans_presets.java:336 build/trans_presets.java:371
+#: build/trans_presets.java:391 build/trans_presets.java:442
+#: build/trans_presets.java:451 build/trans_presets.java:458
+#: build/trans_presets.java:494 build/trans_presets.java:525
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:598 build/trans_presets.java:621
+#: build/trans_presets.java:640 build/trans_presets.java:661
+#: build/trans_presets.java:1316 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brücke"
@@ -25316,17 +25083,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:95 build/trans_presets.java:113
-#: build/trans_presets.java:134 build/trans_presets.java:154
-#: build/trans_presets.java:176 build/trans_presets.java:194
-#: build/trans_presets.java:215 build/trans_presets.java:235
-#: build/trans_presets.java:252 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:310
-#: build/trans_presets.java:330 build/trans_presets.java:365
-#: build/trans_presets.java:385 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:488
-#: build/trans_presets.java:519 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:655 build/trans_presets.java:1310
+#: build/trans_presets.java:102 build/trans_presets.java:120
+#: build/trans_presets.java:141 build/trans_presets.java:161
+#: build/trans_presets.java:183 build/trans_presets.java:201
+#: build/trans_presets.java:222 build/trans_presets.java:242
+#: build/trans_presets.java:259 build/trans_presets.java:279
+#: build/trans_presets.java:298 build/trans_presets.java:317
+#: build/trans_presets.java:337 build/trans_presets.java:372
+#: build/trans_presets.java:392 build/trans_presets.java:443
+#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:526 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:599
+#: build/trans_presets.java:622 build/trans_presets.java:641
+#: build/trans_presets.java:662 build/trans_presets.java:1317
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -25357,17 +25124,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:96 build/trans_presets.java:114
-#: build/trans_presets.java:135 build/trans_presets.java:155
-#: build/trans_presets.java:177 build/trans_presets.java:195
-#: build/trans_presets.java:216 build/trans_presets.java:236
-#: build/trans_presets.java:253 build/trans_presets.java:273
-#: build/trans_presets.java:292 build/trans_presets.java:311
-#: build/trans_presets.java:331 build/trans_presets.java:366
-#: build/trans_presets.java:386 build/trans_presets.java:437
-#: build/trans_presets.java:489 build/trans_presets.java:520
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:656
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:103 build/trans_presets.java:121
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:184 build/trans_presets.java:202
+#: build/trans_presets.java:223 build/trans_presets.java:243
+#: build/trans_presets.java:260 build/trans_presets.java:280
+#: build/trans_presets.java:299 build/trans_presets.java:318
+#: build/trans_presets.java:338 build/trans_presets.java:373
+#: build/trans_presets.java:393 build/trans_presets.java:444
+#: build/trans_presets.java:496 build/trans_presets.java:527
+#: build/trans_presets.java:555 build/trans_presets.java:576
+#: build/trans_presets.java:600 build/trans_presets.java:623
+#: build/trans_presets.java:642 build/trans_presets.java:663
+#: build/trans_presets.java:1318
 msgid "Cutting"
 msgstr "Senke"
@@ -25398,17 +25165,17 @@
 #. item "Ways/Steps" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:97 build/trans_presets.java:115
-#: build/trans_presets.java:136 build/trans_presets.java:156
-#: build/trans_presets.java:178 build/trans_presets.java:196
-#: build/trans_presets.java:217 build/trans_presets.java:237
-#: build/trans_presets.java:254 build/trans_presets.java:274
-#: build/trans_presets.java:293 build/trans_presets.java:312
-#: build/trans_presets.java:332 build/trans_presets.java:367
-#: build/trans_presets.java:387 build/trans_presets.java:438
-#: build/trans_presets.java:490 build/trans_presets.java:521
-#: build/trans_presets.java:549 build/trans_presets.java:570
-#: build/trans_presets.java:594 build/trans_presets.java:617
-#: build/trans_presets.java:636 build/trans_presets.java:657
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:104 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:163
+#: build/trans_presets.java:185 build/trans_presets.java:203
+#: build/trans_presets.java:224 build/trans_presets.java:244
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:300 build/trans_presets.java:319
+#: build/trans_presets.java:339 build/trans_presets.java:374
+#: build/trans_presets.java:394 build/trans_presets.java:445
+#: build/trans_presets.java:497 build/trans_presets.java:528
+#: build/trans_presets.java:556 build/trans_presets.java:577
+#: build/trans_presets.java:601 build/trans_presets.java:624
+#: build/trans_presets.java:643 build/trans_presets.java:664
+#: build/trans_presets.java:1319
 msgid "Embankment"
 msgstr "Straßendamm"
@@ -25438,16 +25205,16 @@
 #. item "Ways/Dedicated Footway" check "Lit"
 #. item "Ways/Steps" check "Lit"
-#: build/trans_presets.java:98 build/trans_presets.java:116
-#: build/trans_presets.java:137 build/trans_presets.java:157
-#: build/trans_presets.java:179 build/trans_presets.java:197
-#: build/trans_presets.java:218 build/trans_presets.java:238
-#: build/trans_presets.java:255 build/trans_presets.java:275
-#: build/trans_presets.java:294 build/trans_presets.java:313
-#: build/trans_presets.java:333 build/trans_presets.java:352
-#: build/trans_presets.java:368 build/trans_presets.java:388
-#: build/trans_presets.java:491 build/trans_presets.java:522
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:595 build/trans_presets.java:618
-#: build/trans_presets.java:637 build/trans_presets.java:658
+#: build/trans_presets.java:105 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:164
+#: build/trans_presets.java:186 build/trans_presets.java:204
+#: build/trans_presets.java:225 build/trans_presets.java:245
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:301 build/trans_presets.java:320
+#: build/trans_presets.java:340 build/trans_presets.java:359
+#: build/trans_presets.java:375 build/trans_presets.java:395
+#: build/trans_presets.java:498 build/trans_presets.java:529
+#: build/trans_presets.java:557 build/trans_presets.java:578
+#: build/trans_presets.java:602 build/trans_presets.java:625
+#: build/trans_presets.java:644 build/trans_presets.java:665
 msgid "Lit"
 msgstr "Beleuchtet"
@@ -25455,5 +25222,5 @@
 #. </optional>
 #. item "Highways/Streets/Motorway Link"
-#: build/trans_presets.java:101
+#: build/trans_presets.java:108
 msgid "Motorway Link"
 msgstr "Autobahnanschluß"
@@ -25462,5 +25229,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
 #. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
-#: build/trans_presets.java:104
+#: build/trans_presets.java:111
 msgid "Edit Motorway Link"
 msgstr "Autobahnanschluß bearbeiten"
@@ -25468,5 +25235,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk"
-#: build/trans_presets.java:119
+#: build/trans_presets.java:126
 msgid "Trunk"
 msgstr "Schnellstraße"
@@ -25475,5 +25242,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
 #. item "Highways/Streets/Trunk" label "Edit Trunk"
-#: build/trans_presets.java:122
+#: build/trans_presets.java:129
 msgid "Edit Trunk"
 msgstr "Schnellstraße bearbeiten"
@@ -25483,6 +25250,6 @@
 #. item "Highways/Streets/Primary" check "Motorroad"
 #. item "Highways/Streets/Primary Link" check "Motorroad"
-#: build/trans_presets.java:132 build/trans_presets.java:152
-#: build/trans_presets.java:174 build/trans_presets.java:192
+#: build/trans_presets.java:139 build/trans_presets.java:159
+#: build/trans_presets.java:181 build/trans_presets.java:199
 msgid "Motorroad"
 msgstr "Kraftfahrstraße"
@@ -25490,5 +25257,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk Link"
-#: build/trans_presets.java:140
+#: build/trans_presets.java:147
 msgid "Trunk Link"
 msgstr "Schnellstraßenanschluß"
@@ -25497,5 +25264,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
 #. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
-#: build/trans_presets.java:143
+#: build/trans_presets.java:150
 msgid "Edit Trunk Link"
 msgstr "Schnellstraßenanschluß bearbeiten"
@@ -25508,5 +25275,5 @@
 #. </button>
 #. <button label="Primary" hotkey="2">
-#: build/trans_presets.java:161 build/trans_surveyor.java:76
+#: build/trans_presets.java:168 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Bundesstraße"
@@ -25515,5 +25282,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
 #. item "Highways/Streets/Primary" label "Edit Primary Road"
-#: build/trans_presets.java:164
+#: build/trans_presets.java:171
 msgid "Edit Primary Road"
 msgstr "Bundesstraße bearbeiten"
@@ -25521,5 +25288,5 @@
 #. </optional>
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:182
+#: build/trans_presets.java:189
 msgid "Primary Link"
 msgstr "Bundesstraßenanschluß"
@@ -25527,5 +25294,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary_link" />
 #. item "Highways/Streets/Primary Link" label "Edit Primary Link"
-#: build/trans_presets.java:184
+#: build/trans_presets.java:191
 msgid "Edit Primary Link"
 msgstr "Bundesstraßenanschluß bearbeiten"
@@ -25537,5 +25304,5 @@
 #. </button>
 #. <button label="Secondary" hotkey="3">
-#: build/trans_presets.java:200 build/trans_surveyor.java:80
+#: build/trans_presets.java:207 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Landesstraße"
@@ -25545,5 +25312,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
 #. item "Highways/Streets/Secondary" label "Edit Secondary Road"
-#: build/trans_presets.java:204
+#: build/trans_presets.java:211
 msgid "Edit Secondary Road"
 msgstr "Landesstraße bearbeiten"
@@ -25551,5 +25318,5 @@
 #. </optional>
 #. item "Highways/Streets/Tertiary"
-#: build/trans_presets.java:221
+#: build/trans_presets.java:228
 msgid "Tertiary"
 msgstr "Kreisstraße"
@@ -25559,5 +25326,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
 #. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
-#: build/trans_presets.java:225
+#: build/trans_presets.java:232
 msgid "Edit Tertiary Road"
 msgstr "Kreisstraße bearbeiten"
@@ -25569,5 +25336,5 @@
 #. </button>
 #. <button label="Unclassified" hotkey="4">
-#: build/trans_presets.java:241 build/trans_surveyor.java:84
+#: build/trans_presets.java:248 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Verbindungsstraße"
@@ -25577,5 +25344,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
 #. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
-#: build/trans_presets.java:245
+#: build/trans_presets.java:252
 msgid "Edit Unclassified Road"
 msgstr "Verbindungsstraße bearbeiten"
@@ -25585,6 +25352,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Dedicated Footway" check "Passing Places"
-#: build/trans_presets.java:256 build/trans_presets.java:334
-#: build/trans_presets.java:619 build/trans_presets.java:638
+#: build/trans_presets.java:263 build/trans_presets.java:341
+#: build/trans_presets.java:626 build/trans_presets.java:645
 msgid "Passing Places"
 msgstr "Ausweichstellen"
@@ -25611,15 +25378,15 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:297 build/trans_presets.java:316
-#: build/trans_presets.java:338 build/trans_presets.java:372
-#: build/trans_presets.java:393 build/trans_presets.java:441
-#: build/trans_presets.java:457 build/trans_presets.java:471
-#: build/trans_presets.java:497 build/trans_presets.java:533
-#: build/trans_presets.java:553 build/trans_presets.java:574
-#: build/trans_presets.java:597 build/trans_presets.java:621
-#: build/trans_presets.java:640 build/trans_presets.java:660
-#: build/trans_presets.java:1316 build/trans_presets.java:1605
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:266 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:323
+#: build/trans_presets.java:345 build/trans_presets.java:379
+#: build/trans_presets.java:400 build/trans_presets.java:448
+#: build/trans_presets.java:464 build/trans_presets.java:478
+#: build/trans_presets.java:504 build/trans_presets.java:540
+#: build/trans_presets.java:560 build/trans_presets.java:581
+#: build/trans_presets.java:604 build/trans_presets.java:628
+#: build/trans_presets.java:647 build/trans_presets.java:667
+#: build/trans_presets.java:1323 build/trans_presets.java:1612
+#: build/trans_presets.java:1657
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
@@ -25631,5 +25398,5 @@
 #. </button>
 #. <button label="Residential" hotkey="5">
-#: build/trans_presets.java:262 build/trans_surveyor.java:88
+#: build/trans_presets.java:269 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ortsstraße"
@@ -25638,5 +25405,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
 #. item "Highways/Streets/Residential" label "Edit Residential Street"
-#: build/trans_presets.java:265
+#: build/trans_presets.java:272
 msgid "Edit Residential Street"
 msgstr "Ortsstraße bearbeiten"
@@ -25658,179 +25425,415 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
 msgid "Surface"
 msgstr "Oberfläche"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Track" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
 msgid "paved"
 msgstr "befestigt"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321
 msgid "unpaved"
 msgstr "unbefestigt"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321
 msgid "asphalt"
 msgstr "asphaltiert"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Track" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
 msgid "concrete"
 msgstr "Beton"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314 build/trans_presets.java:2491
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#. item "Facilities/Bench" combo "Material" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321 build/trans_presets.java:2498
 msgid "metal"
 msgstr "Metall"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314 build/trans_presets.java:2193
-#: build/trans_presets.java:2491
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#. item "Leisure/Public Grill" combo "Fuel" display value
+#. item "Facilities/Bench" combo "Material" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321 build/trans_presets.java:2200
+#: build/trans_presets.java:2498
 msgid "wood"
 msgstr "Holz"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321
 msgid "paving_stones"
 msgstr "Gehwegplatte/Pflaster"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Track" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
 msgid "cobblestone"
 msgstr "Kopfsteinpflaster"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Track" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
 msgid "gravel"
 msgstr "Schotter"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321
 msgid "pebblestone"
 msgstr "Kies"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321
 msgid "compacted"
 msgstr "verdichtet"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:515
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:589 build/trans_presets.java:612
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:522
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:596 build/trans_presets.java:619
+#: build/trans_presets.java:639 build/trans_presets.java:659
+#: build/trans_presets.java:1321
 msgid "grass_paver"
 msgstr "Rasengitterstein"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Track" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
 msgid "grass"
 msgstr "Gras"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Track" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
 msgid "sand"
 msgstr "Sand"
 
-#: build/trans_presets.java:277 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:336
-#: build/trans_presets.java:351 build/trans_presets.java:370
-#: build/trans_presets.java:390 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:589
-#: build/trans_presets.java:612 build/trans_presets.java:632
-#: build/trans_presets.java:652 build/trans_presets.java:1314
-#: build/trans_presets.java:2461
+#. item "Highways/Streets/Residential" combo "Surface" display value
+#. item "Highways/Streets/Living Street" combo "Surface" display value
+#. item "Highways/Streets/Pedestrian" combo "Surface" display value
+#. item "Highways/Streets/Service" combo "Surface" display value
+#. item "Highways/Streets/Parking Aisle" combo "Surface" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface" display value
+#. item "Highways/Streets/Construction" combo "Surface" display value
+#. item "Ways/Track" combo "Surface" display value
+#. item "Ways/Path" combo "Surface" display value
+#. item "Ways/Dedicated Bridleway" combo "Surface" display value
+#. item "Ways/Dedicated Cycleway" combo "Surface" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface" display value
+#. item "Ways/Dedicated Footway" combo "Surface" display value
+#. item "Ways/Steps" combo "Surface" display value
+#. item "Transport/Railway/Bus Guideway" combo "Surface" display value
+#. item "Facilities/Clock" combo "Support" display value
+#: build/trans_presets.java:284 build/trans_presets.java:303
+#: build/trans_presets.java:322 build/trans_presets.java:343
+#: build/trans_presets.java:358 build/trans_presets.java:377
+#: build/trans_presets.java:397 build/trans_presets.java:492
+#: build/trans_presets.java:522 build/trans_presets.java:551
+#: build/trans_presets.java:572 build/trans_presets.java:596
+#: build/trans_presets.java:619 build/trans_presets.java:639
+#: build/trans_presets.java:659 build/trans_presets.java:1321
+#: build/trans_presets.java:2468
 msgid "ground"
 msgstr "Erde"
@@ -25838,5 +25841,5 @@
 #. </optional>
 #. item "Highways/Streets/Living Street"
-#: build/trans_presets.java:281
+#: build/trans_presets.java:288
 msgid "Living Street"
 msgstr "Spielstraße"
@@ -25845,5 +25848,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
 #. item "Highways/Streets/Living Street" label "Edit Living Street"
-#: build/trans_presets.java:284
+#: build/trans_presets.java:291
 msgid "Edit Living Street"
 msgstr "Spielstraße bearbeiten"
@@ -25851,5 +25854,5 @@
 #. </optional>
 #. item "Highways/Streets/Pedestrian"
-#: build/trans_presets.java:300
+#: build/trans_presets.java:307
 msgid "Pedestrian"
 msgstr "Fußgängerzone"
@@ -25858,5 +25861,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
 #. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
-#: build/trans_presets.java:303
+#: build/trans_presets.java:310
 msgid "Edit Pedestrian Street"
 msgstr "Fußgängerzone bearbeiten"
@@ -25864,5 +25867,5 @@
 #. </optional>
 #. item "Highways/Streets/Service"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:326
 msgid "Service"
 msgstr "Zufahrtsstraße"
@@ -25871,5 +25874,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
 #. item "Highways/Streets/Service" label "Edit Serviceway"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:329
 msgid "Edit Serviceway"
 msgstr "Zufahrtsstraße bearbeiten"
@@ -25879,17 +25882,20 @@
 #. <optional>
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:326
+#: build/trans_presets.java:333
 msgid "Serviceway type"
 msgstr "Zufahrtsstraßentyp"
 
-#: build/trans_presets.java:326
+#. item "Highways/Streets/Service" combo "Serviceway type" display value
+#: build/trans_presets.java:333
 msgid "alley"
 msgstr "Gasse"
 
-#: build/trans_presets.java:326
+#. item "Highways/Streets/Service" combo "Serviceway type" display value
+#: build/trans_presets.java:333
 msgid "driveway"
 msgstr "Auffahrt"
 
-#: build/trans_presets.java:326
+#. item "Highways/Streets/Service" combo "Serviceway type" display value
+#: build/trans_presets.java:333
 msgid "parking_aisle"
 msgstr "Parkplatzweg"
@@ -25897,5 +25903,5 @@
 #. </optional>
 #. item "Highways/Streets/Parking Aisle"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:348
 msgid "Parking Aisle"
 msgstr "Parkplatzweg"
@@ -25905,5 +25911,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
 #. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
-#: build/trans_presets.java:345
+#: build/trans_presets.java:352
 msgid "Edit Parking Aisle"
 msgstr "Parkplatzweg bearbeiten"
@@ -25911,5 +25917,5 @@
 #. </optional>
 #. item "Highways/Streets/Road (Unknown Type)"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:362
 msgid "Road (Unknown Type)"
 msgstr "Unbekannter Straßentyp"
@@ -25918,5 +25924,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
 #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:365
 msgid "Edit Road of unknown type"
 msgstr "Straße mit unbekanntem Typ bearbeiten"
@@ -25924,18 +25930,19 @@
 #. </optional>
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:375
+#: build/trans_presets.java:382
 msgid "Construction"
 msgstr "Baustelle"
 
 #. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
-#: build/trans_presets.java:376
+#: build/trans_presets.java:383
 msgid "Edit Highway Under Construction"
 msgstr "Eine im Bau befindliche Straße bearbeiten"
 
 #. item "Highways/Streets/Construction" combo "Junction"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:398
 msgid "Junction"
 msgstr "Kreuzung"
 
+#. item "Highways/Streets/Construction" combo "Junction" display value
 #. </rule>
 #.
@@ -25977,5 +25984,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:391 build/trans_style.java:739
+#: build/trans_presets.java:398 build/trans_style.java:739
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -25984,5 +25991,5 @@
 #. <separator/>
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:397
+#: build/trans_presets.java:404
 msgid "Road Restrictions"
 msgstr "Straßenbeschränkungen"
@@ -25991,15 +25998,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:407
 msgid "Edit Road Restrictions"
 msgstr "Straßenbeschränkungen bearbeiten"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:402
+#: build/trans_presets.java:409
 msgid "Toll"
 msgstr "Maut"
 
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#: build/trans_presets.java:403
+#: build/trans_presets.java:410
 msgid "No exit (cul-de-sac)"
 msgstr "Kein Ausgang (Sackgasse)"
@@ -26008,72 +26015,205 @@
 #. item "Ways/Track" combo "Access"
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:404 build/trans_presets.java:494
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:411 build/trans_presets.java:501
+#: build/trans_presets.java:2178
 msgid "Access"
 msgstr "Genereller Zugang"
 
-#: build/trans_presets.java:404 build/trans_presets.java:405
-#: build/trans_presets.java:406 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:409
-#: build/trans_presets.java:410 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:413
-#: build/trans_presets.java:451 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:496
-#: build/trans_presets.java:524 build/trans_presets.java:525
-#: build/trans_presets.java:526 build/trans_presets.java:527
-#: build/trans_presets.java:528 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:572
-#: build/trans_presets.java:735 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1248
-#: build/trans_presets.java:1260 build/trans_presets.java:1272
-#: build/trans_presets.java:1284 build/trans_presets.java:1296
-#: build/trans_presets.java:1407 build/trans_presets.java:1408
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:1428
-#: build/trans_presets.java:1519 build/trans_presets.java:1531
-#: build/trans_presets.java:1532 build/trans_presets.java:1533
-#: build/trans_presets.java:1534 build/trans_presets.java:1535
-#: build/trans_presets.java:1639 build/trans_presets.java:1640
-#: build/trans_presets.java:1641 build/trans_presets.java:1759
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1793
-#: build/trans_presets.java:1794 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1810
-#: build/trans_presets.java:1811 build/trans_presets.java:1812
-#: build/trans_presets.java:1813 build/trans_presets.java:1828
-#: build/trans_presets.java:1829 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1845
-#: build/trans_presets.java:1846 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1862
-#: build/trans_presets.java:1863 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1868
-#: build/trans_presets.java:1884 build/trans_presets.java:1885
-#: build/trans_presets.java:1886 build/trans_presets.java:1887
-#: build/trans_presets.java:1907 build/trans_presets.java:1908
-#: build/trans_presets.java:1909 build/trans_presets.java:1910
-#: build/trans_presets.java:1926 build/trans_presets.java:1927
-#: build/trans_presets.java:1928 build/trans_presets.java:1929
-#: build/trans_presets.java:1943 build/trans_presets.java:1944
-#: build/trans_presets.java:1945 build/trans_presets.java:1946
-#: build/trans_presets.java:1962 build/trans_presets.java:1963
-#: build/trans_presets.java:1964 build/trans_presets.java:1965
-#: build/trans_presets.java:1981 build/trans_presets.java:1982
-#: build/trans_presets.java:1983 build/trans_presets.java:1984
-#: build/trans_presets.java:1997 build/trans_presets.java:1998
-#: build/trans_presets.java:1999 build/trans_presets.java:2000
-#: build/trans_presets.java:2014 build/trans_presets.java:2015
-#: build/trans_presets.java:2016 build/trans_presets.java:2017
-#: build/trans_presets.java:2031 build/trans_presets.java:2032
-#: build/trans_presets.java:2111 build/trans_presets.java:2121
-#: build/trans_presets.java:2171 build/trans_presets.java:2192
-#: build/trans_presets.java:2377 build/trans_presets.java:2432
-#: build/trans_presets.java:2433 build/trans_presets.java:2490
-#: build/trans_presets.java:2505 build/trans_presets.java:2506
-#: build/trans_presets.java:2507 build/trans_presets.java:2928
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural" display value
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Horse" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Highways/Streets/Bridge" combo "Bridge" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#. item "Ways/Path" combo "Foot" display value
+#. item "Ways/Path" combo "Bicycle" display value
+#. item "Ways/Path" combo "Horse" display value
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Path" combo "Ski" display value
+#. item "Ways/Path" combo "Snowmobile" display value
+#. item "Ways/Path" combo "Motorcar" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Calming" combo "Type" display value
+#. item "Transport/Railway/Rail" combo "Electrified" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified" display value
+#. item "Transport/Railway/Monorail" combo "Electrified" display value
+#. item "Transport/Railway/Preserved" combo "Electrified" display value
+#. item "Transport/Railway/Light Rail" combo "Electrified" display value
+#. item "Transport/Railway/Subway" combo "Electrified" display value
+#. item "Transport/Railway/Tram" combo "Electrified" display value
+#. item "Car/Parking" combo "Park and Ride" display value
+#. item "Car/Parking" combo "Fee" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Car/Fuel" combo "With shop" display value
+#. item "Motorcycle/Parking" combo "Fee" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
+#. item "Public Transport/Bus Stop" combo "Shelter" display value
+#. item "Public Transport/Bus Stop" combo "Bench" display value
+#. item "Public Transport/Bus Stop" combo "Tactile Paving" display value
+#. item "Facilities/Accommodation/Hotel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Hotel" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Hotel" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Motel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Motel" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Motel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Motel" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Guest House" combo "Internet access" display value
+#. item "Facilities/Accommodation/Guest House" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Guest House" combo "Smoking" display value
+#. item "Facilities/Accommodation/Guest House" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Chalet" combo "Internet access" display value
+#. item "Facilities/Accommodation/Chalet" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Chalet" combo "Smoking" display value
+#. item "Facilities/Accommodation/Chalet" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Hostel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Hostel" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Hostel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Hostel" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Smoking" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Smoking" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Smoking" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Wheelchairs" display value
+#. item "Food+Drinks/Restaurant" combo "Internet access" display value
+#. item "Food+Drinks/Restaurant" combo "Internet access fee" display value
+#. item "Food+Drinks/Restaurant" combo "Smoking" display value
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs" display value
+#. item "Food+Drinks/Fast Food" combo "Internet access" display value
+#. item "Food+Drinks/Fast Food" combo "Internet access fee" display value
+#. item "Food+Drinks/Fast Food" combo "Smoking" display value
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs" display value
+#. item "Food+Drinks/Food Court" combo "Internet access" display value
+#. item "Food+Drinks/Food Court" combo "Internet access fee" display value
+#. item "Food+Drinks/Food Court" combo "Smoking" display value
+#. item "Food+Drinks/Food Court" combo "Wheelchairs" display value
+#. item "Food+Drinks/Cafe" combo "Internet access" display value
+#. item "Food+Drinks/Cafe" combo "Internet access fee" display value
+#. item "Food+Drinks/Cafe" combo "Smoking" display value
+#. item "Food+Drinks/Cafe" combo "Wheelchairs" display value
+#. item "Food+Drinks/Pub" combo "Internet access" display value
+#. item "Food+Drinks/Pub" combo "Internet access fee" display value
+#. item "Food+Drinks/Pub" combo "Smoking" display value
+#. item "Food+Drinks/Pub" combo "Wheelchairs" display value
+#. item "Food+Drinks/Biergarten" combo "Internet access" display value
+#. item "Food+Drinks/Biergarten" combo "Internet access fee" display value
+#. item "Food+Drinks/Biergarten" combo "Smoking" display value
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs" display value
+#. item "Food+Drinks/Bar" combo "Internet access" display value
+#. item "Food+Drinks/Bar" combo "Internet access fee" display value
+#. item "Food+Drinks/Bar" combo "Smoking" display value
+#. item "Food+Drinks/Bar" combo "Wheelchairs" display value
+#. item "Food+Drinks/Nightclub" combo "Smoking" display value
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs" display value
+#. item "Tourism/Information Terminal" combo "Fee" display value
+#. item "Tourism/Audioguide" combo "Fee" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Leisure/Public Grill" combo "Covered" display value
+#. item "Health/Pharmacy" combo "Dispensing" display value
+#. item "Facilities/Toilets" combo "Fee" display value
+#. item "Facilities/Toilets" combo "Wheelchair" display value
+#. item "Facilities/Bench" combo "Backrest" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
+#. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
+#: build/trans_presets.java:411 build/trans_presets.java:412
+#: build/trans_presets.java:413 build/trans_presets.java:414
+#: build/trans_presets.java:415 build/trans_presets.java:416
+#: build/trans_presets.java:417 build/trans_presets.java:418
+#: build/trans_presets.java:419 build/trans_presets.java:420
+#: build/trans_presets.java:458 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:536
+#: build/trans_presets.java:537 build/trans_presets.java:579
+#: build/trans_presets.java:742 build/trans_presets.java:1231
+#: build/trans_presets.java:1243 build/trans_presets.java:1255
+#: build/trans_presets.java:1267 build/trans_presets.java:1279
+#: build/trans_presets.java:1291 build/trans_presets.java:1303
+#: build/trans_presets.java:1414 build/trans_presets.java:1415
+#: build/trans_presets.java:1418 build/trans_presets.java:1419
+#: build/trans_presets.java:1420 build/trans_presets.java:1435
+#: build/trans_presets.java:1526 build/trans_presets.java:1538
+#: build/trans_presets.java:1539 build/trans_presets.java:1540
+#: build/trans_presets.java:1541 build/trans_presets.java:1542
+#: build/trans_presets.java:1646 build/trans_presets.java:1647
+#: build/trans_presets.java:1648 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1787 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1817
+#: build/trans_presets.java:1818 build/trans_presets.java:1819
+#: build/trans_presets.java:1820 build/trans_presets.java:1835
+#: build/trans_presets.java:1836 build/trans_presets.java:1837
+#: build/trans_presets.java:1838 build/trans_presets.java:1852
+#: build/trans_presets.java:1853 build/trans_presets.java:1854
+#: build/trans_presets.java:1855 build/trans_presets.java:1869
+#: build/trans_presets.java:1870 build/trans_presets.java:1871
+#: build/trans_presets.java:1872 build/trans_presets.java:1875
+#: build/trans_presets.java:1891 build/trans_presets.java:1892
+#: build/trans_presets.java:1893 build/trans_presets.java:1894
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1917
+#: build/trans_presets.java:1933 build/trans_presets.java:1934
+#: build/trans_presets.java:1935 build/trans_presets.java:1936
+#: build/trans_presets.java:1950 build/trans_presets.java:1951
+#: build/trans_presets.java:1952 build/trans_presets.java:1953
+#: build/trans_presets.java:1969 build/trans_presets.java:1970
+#: build/trans_presets.java:1971 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:1989
+#: build/trans_presets.java:1990 build/trans_presets.java:1991
+#: build/trans_presets.java:2004 build/trans_presets.java:2005
+#: build/trans_presets.java:2006 build/trans_presets.java:2007
+#: build/trans_presets.java:2021 build/trans_presets.java:2022
+#: build/trans_presets.java:2023 build/trans_presets.java:2024
+#: build/trans_presets.java:2038 build/trans_presets.java:2039
+#: build/trans_presets.java:2118 build/trans_presets.java:2128
+#: build/trans_presets.java:2178 build/trans_presets.java:2199
+#: build/trans_presets.java:2384 build/trans_presets.java:2439
+#: build/trans_presets.java:2440 build/trans_presets.java:2497
+#: build/trans_presets.java:2512 build/trans_presets.java:2513
+#: build/trans_presets.java:2514 build/trans_presets.java:2935
 msgid "yes"
 msgstr "ja"
 
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Horse" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#. item "Leisure/Sauna" combo "Access" display value
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. </rule>
@@ -26081,14 +26221,26 @@
 #. <condition k="access" v="private"/>
 #. color private
-#: build/trans_presets.java:404 build/trans_presets.java:406
-#: build/trans_presets.java:407 build/trans_presets.java:408
-#: build/trans_presets.java:409 build/trans_presets.java:410
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:496
-#: build/trans_presets.java:2171 build/trans_style.java:175
+#: build/trans_presets.java:411 build/trans_presets.java:413
+#: build/trans_presets.java:414 build/trans_presets.java:415
+#: build/trans_presets.java:416 build/trans_presets.java:417
+#: build/trans_presets.java:418 build/trans_presets.java:419
+#: build/trans_presets.java:420 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:2178 build/trans_style.java:175
 msgid "private"
 msgstr "Privat"
 
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural" display value
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. </rule>
@@ -26096,14 +26248,28 @@
 #. <condition k="access" v="destination"/>
 #. color destination
-#: build/trans_presets.java:404 build/trans_presets.java:405
-#: build/trans_presets.java:406 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:409
 #: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:496
+#: build/trans_presets.java:413 build/trans_presets.java:414
+#: build/trans_presets.java:415 build/trans_presets.java:416
+#: build/trans_presets.java:418 build/trans_presets.java:419
+#: build/trans_presets.java:420 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
 #: build/trans_style.java:180
 msgid "destination"
 msgstr "Anlieger frei"
 
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural" display value
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Horse" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#. item "Leisure/Sauna" combo "Access" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -26119,137 +26285,319 @@
 #. <condition k="access" v="permissive"/>
 #. color permissive
-#: build/trans_presets.java:404 build/trans_presets.java:405
-#: build/trans_presets.java:406 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:409
-#: build/trans_presets.java:410 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:413
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:496 build/trans_presets.java:2171
+#: build/trans_presets.java:411 build/trans_presets.java:412
+#: build/trans_presets.java:413 build/trans_presets.java:414
+#: build/trans_presets.java:415 build/trans_presets.java:416
+#: build/trans_presets.java:417 build/trans_presets.java:418
+#: build/trans_presets.java:419 build/trans_presets.java:420
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:2178
 #: build/trans_style.java:170
 msgid "permissive"
 msgstr "Privat; Zugang gestattet"
 
-#: build/trans_presets.java:404 build/trans_presets.java:408
-#: build/trans_presets.java:409 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:496
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#: build/trans_presets.java:411 build/trans_presets.java:415
+#: build/trans_presets.java:416 build/trans_presets.java:418
+#: build/trans_presets.java:419 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
 msgid "agricultural"
 msgstr "Landwirtschaftlicher Verkehr gestattet"
 
-#: build/trans_presets.java:404 build/trans_presets.java:408
-#: build/trans_presets.java:409 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:496
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#: build/trans_presets.java:411 build/trans_presets.java:415
+#: build/trans_presets.java:416 build/trans_presets.java:418
+#: build/trans_presets.java:419 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
 msgid "forestry"
 msgstr "Forstwirtschaftlicher Verkehr gestattet"
 
-#: build/trans_presets.java:404 build/trans_presets.java:405
-#: build/trans_presets.java:408 build/trans_presets.java:409
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
 #: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:496
+#: build/trans_presets.java:415 build/trans_presets.java:416
+#: build/trans_presets.java:418 build/trans_presets.java:419
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503
 msgid "delivery"
 msgstr "Lieferverkehr frei"
 
-#: build/trans_presets.java:404 build/trans_presets.java:405
-#: build/trans_presets.java:406 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:409
-#: build/trans_presets.java:410 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:413
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:496 build/trans_presets.java:517
-#: build/trans_presets.java:524 build/trans_presets.java:525
-#: build/trans_presets.java:526 build/trans_presets.java:527
-#: build/trans_presets.java:528 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:572
-#: build/trans_presets.java:704 build/trans_presets.java:726
-#: build/trans_presets.java:1224 build/trans_presets.java:1236
-#: build/trans_presets.java:1248 build/trans_presets.java:1260
-#: build/trans_presets.java:1272 build/trans_presets.java:1284
-#: build/trans_presets.java:1296 build/trans_presets.java:1338
-#: build/trans_presets.java:1407 build/trans_presets.java:1408
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:1428
-#: build/trans_presets.java:1519 build/trans_presets.java:1531
-#: build/trans_presets.java:1532 build/trans_presets.java:1533
-#: build/trans_presets.java:1534 build/trans_presets.java:1535
-#: build/trans_presets.java:1639 build/trans_presets.java:1640
-#: build/trans_presets.java:1641 build/trans_presets.java:1759
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1793
-#: build/trans_presets.java:1794 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1810
-#: build/trans_presets.java:1811 build/trans_presets.java:1812
-#: build/trans_presets.java:1813 build/trans_presets.java:1828
-#: build/trans_presets.java:1829 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1845
-#: build/trans_presets.java:1846 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1862
-#: build/trans_presets.java:1863 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1868
-#: build/trans_presets.java:1884 build/trans_presets.java:1885
-#: build/trans_presets.java:1886 build/trans_presets.java:1887
-#: build/trans_presets.java:1907 build/trans_presets.java:1908
-#: build/trans_presets.java:1909 build/trans_presets.java:1910
-#: build/trans_presets.java:1926 build/trans_presets.java:1927
-#: build/trans_presets.java:1928 build/trans_presets.java:1929
-#: build/trans_presets.java:1943 build/trans_presets.java:1944
-#: build/trans_presets.java:1945 build/trans_presets.java:1946
-#: build/trans_presets.java:1962 build/trans_presets.java:1963
-#: build/trans_presets.java:1964 build/trans_presets.java:1965
-#: build/trans_presets.java:1981 build/trans_presets.java:1982
-#: build/trans_presets.java:1983 build/trans_presets.java:1984
-#: build/trans_presets.java:1997 build/trans_presets.java:1998
-#: build/trans_presets.java:1999 build/trans_presets.java:2000
-#: build/trans_presets.java:2014 build/trans_presets.java:2015
-#: build/trans_presets.java:2016 build/trans_presets.java:2017
-#: build/trans_presets.java:2031 build/trans_presets.java:2032
-#: build/trans_presets.java:2111 build/trans_presets.java:2121
-#: build/trans_presets.java:2192 build/trans_presets.java:2377
-#: build/trans_presets.java:2432 build/trans_presets.java:2433
-#: build/trans_presets.java:2490 build/trans_presets.java:2505
-#: build/trans_presets.java:2506 build/trans_presets.java:2507
-#: build/trans_presets.java:2928 build/trans_presets.java:3011
-#: build/trans_presets.java:3012
+#. item "Highways/Streets/Road Restrictions" combo "Access" display value
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural" display value
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Horse" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#. item "Ways/Path" combo "Visibility" display value
+#. item "Ways/Path" combo "Foot" display value
+#. item "Ways/Path" combo "Bicycle" display value
+#. item "Ways/Path" combo "Horse" display value
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Path" combo "Ski" display value
+#. item "Ways/Path" combo "Snowmobile" display value
+#. item "Ways/Path" combo "Motorcar" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Rail" combo "Electrified" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified" display value
+#. item "Transport/Railway/Monorail" combo "Electrified" display value
+#. item "Transport/Railway/Preserved" combo "Electrified" display value
+#. item "Transport/Railway/Light Rail" combo "Electrified" display value
+#. item "Transport/Railway/Subway" combo "Electrified" display value
+#. item "Transport/Railway/Tram" combo "Electrified" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Park and Ride" display value
+#. item "Car/Parking" combo "Fee" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Car/Fuel" combo "With shop" display value
+#. item "Motorcycle/Parking" combo "Fee" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
+#. item "Public Transport/Bus Stop" combo "Shelter" display value
+#. item "Public Transport/Bus Stop" combo "Bench" display value
+#. item "Public Transport/Bus Stop" combo "Tactile Paving" display value
+#. item "Facilities/Accommodation/Hotel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Hotel" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Hotel" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Motel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Motel" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Motel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Motel" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Guest House" combo "Internet access" display value
+#. item "Facilities/Accommodation/Guest House" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Guest House" combo "Smoking" display value
+#. item "Facilities/Accommodation/Guest House" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Chalet" combo "Internet access" display value
+#. item "Facilities/Accommodation/Chalet" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Chalet" combo "Smoking" display value
+#. item "Facilities/Accommodation/Chalet" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Hostel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Hostel" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Hostel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Hostel" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Smoking" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Smoking" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Wheelchairs" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access fee" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Smoking" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Wheelchairs" display value
+#. item "Food+Drinks/Restaurant" combo "Internet access" display value
+#. item "Food+Drinks/Restaurant" combo "Internet access fee" display value
+#. item "Food+Drinks/Restaurant" combo "Smoking" display value
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs" display value
+#. item "Food+Drinks/Fast Food" combo "Internet access" display value
+#. item "Food+Drinks/Fast Food" combo "Internet access fee" display value
+#. item "Food+Drinks/Fast Food" combo "Smoking" display value
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs" display value
+#. item "Food+Drinks/Food Court" combo "Internet access" display value
+#. item "Food+Drinks/Food Court" combo "Internet access fee" display value
+#. item "Food+Drinks/Food Court" combo "Smoking" display value
+#. item "Food+Drinks/Food Court" combo "Wheelchairs" display value
+#. item "Food+Drinks/Cafe" combo "Internet access" display value
+#. item "Food+Drinks/Cafe" combo "Internet access fee" display value
+#. item "Food+Drinks/Cafe" combo "Smoking" display value
+#. item "Food+Drinks/Cafe" combo "Wheelchairs" display value
+#. item "Food+Drinks/Pub" combo "Internet access" display value
+#. item "Food+Drinks/Pub" combo "Internet access fee" display value
+#. item "Food+Drinks/Pub" combo "Smoking" display value
+#. item "Food+Drinks/Pub" combo "Wheelchairs" display value
+#. item "Food+Drinks/Biergarten" combo "Internet access" display value
+#. item "Food+Drinks/Biergarten" combo "Internet access fee" display value
+#. item "Food+Drinks/Biergarten" combo "Smoking" display value
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs" display value
+#. item "Food+Drinks/Bar" combo "Internet access" display value
+#. item "Food+Drinks/Bar" combo "Internet access fee" display value
+#. item "Food+Drinks/Bar" combo "Smoking" display value
+#. item "Food+Drinks/Bar" combo "Wheelchairs" display value
+#. item "Food+Drinks/Nightclub" combo "Smoking" display value
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs" display value
+#. item "Tourism/Information Terminal" combo "Fee" display value
+#. item "Tourism/Audioguide" combo "Fee" display value
+#. item "Leisure/Public Grill" combo "Covered" display value
+#. item "Health/Pharmacy" combo "Dispensing" display value
+#. item "Facilities/Toilets" combo "Fee" display value
+#. item "Facilities/Toilets" combo "Wheelchair" display value
+#. item "Facilities/Bench" combo "Backrest" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
+#. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
+#. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
+#. item "Man Made/Man Made/Measurement Station" combo "Display" display value
+#: build/trans_presets.java:411 build/trans_presets.java:412
+#: build/trans_presets.java:413 build/trans_presets.java:414
+#: build/trans_presets.java:415 build/trans_presets.java:416
+#: build/trans_presets.java:417 build/trans_presets.java:418
+#: build/trans_presets.java:419 build/trans_presets.java:420
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:524
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:533 build/trans_presets.java:534
+#: build/trans_presets.java:535 build/trans_presets.java:536
+#: build/trans_presets.java:537 build/trans_presets.java:579
+#: build/trans_presets.java:711 build/trans_presets.java:733
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1267
+#: build/trans_presets.java:1279 build/trans_presets.java:1291
+#: build/trans_presets.java:1303 build/trans_presets.java:1345
+#: build/trans_presets.java:1414 build/trans_presets.java:1415
+#: build/trans_presets.java:1418 build/trans_presets.java:1419
+#: build/trans_presets.java:1420 build/trans_presets.java:1435
+#: build/trans_presets.java:1526 build/trans_presets.java:1538
+#: build/trans_presets.java:1539 build/trans_presets.java:1540
+#: build/trans_presets.java:1541 build/trans_presets.java:1542
+#: build/trans_presets.java:1646 build/trans_presets.java:1647
+#: build/trans_presets.java:1648 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1787 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1817
+#: build/trans_presets.java:1818 build/trans_presets.java:1819
+#: build/trans_presets.java:1820 build/trans_presets.java:1835
+#: build/trans_presets.java:1836 build/trans_presets.java:1837
+#: build/trans_presets.java:1838 build/trans_presets.java:1852
+#: build/trans_presets.java:1853 build/trans_presets.java:1854
+#: build/trans_presets.java:1855 build/trans_presets.java:1869
+#: build/trans_presets.java:1870 build/trans_presets.java:1871
+#: build/trans_presets.java:1872 build/trans_presets.java:1875
+#: build/trans_presets.java:1891 build/trans_presets.java:1892
+#: build/trans_presets.java:1893 build/trans_presets.java:1894
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1917
+#: build/trans_presets.java:1933 build/trans_presets.java:1934
+#: build/trans_presets.java:1935 build/trans_presets.java:1936
+#: build/trans_presets.java:1950 build/trans_presets.java:1951
+#: build/trans_presets.java:1952 build/trans_presets.java:1953
+#: build/trans_presets.java:1969 build/trans_presets.java:1970
+#: build/trans_presets.java:1971 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:1989
+#: build/trans_presets.java:1990 build/trans_presets.java:1991
+#: build/trans_presets.java:2004 build/trans_presets.java:2005
+#: build/trans_presets.java:2006 build/trans_presets.java:2007
+#: build/trans_presets.java:2021 build/trans_presets.java:2022
+#: build/trans_presets.java:2023 build/trans_presets.java:2024
+#: build/trans_presets.java:2038 build/trans_presets.java:2039
+#: build/trans_presets.java:2118 build/trans_presets.java:2128
+#: build/trans_presets.java:2199 build/trans_presets.java:2384
+#: build/trans_presets.java:2439 build/trans_presets.java:2440
+#: build/trans_presets.java:2497 build/trans_presets.java:2512
+#: build/trans_presets.java:2513 build/trans_presets.java:2514
+#: build/trans_presets.java:2935 build/trans_presets.java:3018
+#: build/trans_presets.java:3019
 msgid "no"
 msgstr "nein"
 
 #. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#: build/trans_presets.java:405
+#: build/trans_presets.java:412
 msgid "Agricultural"
 msgstr "Landwirtschaft"
 
-#: build/trans_presets.java:405 build/trans_presets.java:406
-#: build/trans_presets.java:407 build/trans_presets.java:408
-#: build/trans_presets.java:409 build/trans_presets.java:410
-#: build/trans_presets.java:411 build/trans_presets.java:412
-#: build/trans_presets.java:413 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:496
-#: build/trans_presets.java:524 build/trans_presets.java:525
-#: build/trans_presets.java:526 build/trans_presets.java:528
-#: build/trans_presets.java:529 build/trans_presets.java:530
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural" display value
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Horse" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#. item "Ways/Path" combo "Foot" display value
+#. item "Ways/Path" combo "Bicycle" display value
+#. item "Ways/Path" combo "Horse" display value
+#. item "Ways/Path" combo "Ski" display value
+#. item "Ways/Path" combo "Snowmobile" display value
+#. item "Ways/Path" combo "Motorcar" display value
+#: build/trans_presets.java:412 build/trans_presets.java:413
+#: build/trans_presets.java:414 build/trans_presets.java:415
+#: build/trans_presets.java:416 build/trans_presets.java:417
+#: build/trans_presets.java:418 build/trans_presets.java:419
+#: build/trans_presets.java:420 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:533 build/trans_presets.java:535
+#: build/trans_presets.java:536 build/trans_presets.java:537
 msgid "designated"
 msgstr "Bezeichnete/vorgesehene Nutzungsart"
 
-#: build/trans_presets.java:406 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:409
-#: build/trans_presets.java:410 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:413
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:496 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:528 build/trans_presets.java:529
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Foot" display value
+#. item "Highways/Streets/Road Restrictions" combo "Goods" display value
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" display value
+#. item "Highways/Streets/Road Restrictions" combo "Horse" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle" display value
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar" display value
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)" display value
+#. item "Ways/Track" combo "Access" display value
+#. item "Ways/Track" combo "Motorcycle" display value
+#. item "Ways/Track" combo "Motorcar" display value
+#. item "Ways/Path" combo "Foot" display value
+#. item "Ways/Path" combo "Bicycle" display value
+#. item "Ways/Path" combo "Horse" display value
+#. item "Ways/Path" combo "Ski" display value
+#. item "Ways/Path" combo "Snowmobile" display value
+#: build/trans_presets.java:413 build/trans_presets.java:414
+#: build/trans_presets.java:415 build/trans_presets.java:416
+#: build/trans_presets.java:417 build/trans_presets.java:418
+#: build/trans_presets.java:419 build/trans_presets.java:420
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:531
+#: build/trans_presets.java:532 build/trans_presets.java:533
+#: build/trans_presets.java:535 build/trans_presets.java:536
 msgid "official"
 msgstr "Offizielle Nutzungsart"
 
 #. item "Highways/Streets/Road Restrictions" combo "Goods"
-#: build/trans_presets.java:408
+#: build/trans_presets.java:415
 msgid "Goods"
 msgstr "Kleinlaster"
 
 #. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:416
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "LKW"
@@ -26266,10 +26614,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:410 build/trans_presets.java:526
-#: build/trans_presets.java:804 build/trans_presets.java:837
-#: build/trans_presets.java:859 build/trans_presets.java:896
-#: build/trans_presets.java:909 build/trans_presets.java:921
-#: build/trans_presets.java:933 build/trans_presets.java:945
-#: build/trans_presets.java:985
+#: build/trans_presets.java:417 build/trans_presets.java:533
+#: build/trans_presets.java:811 build/trans_presets.java:844
+#: build/trans_presets.java:866 build/trans_presets.java:903
+#: build/trans_presets.java:916 build/trans_presets.java:928
+#: build/trans_presets.java:940 build/trans_presets.java:952
+#: build/trans_presets.java:992
 msgid "Horse"
 msgstr "Pferd"
@@ -26288,11 +26636,11 @@
 #. item "Barriers/Sally Port" check "Motorcycle"
 #. group "Motorcycle"
-#: build/trans_presets.java:411 build/trans_presets.java:495
-#: build/trans_presets.java:805 build/trans_presets.java:823
-#: build/trans_presets.java:838 build/trans_presets.java:860
-#: build/trans_presets.java:897 build/trans_presets.java:910
-#: build/trans_presets.java:922 build/trans_presets.java:934
-#: build/trans_presets.java:946 build/trans_presets.java:986
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:418 build/trans_presets.java:502
+#: build/trans_presets.java:812 build/trans_presets.java:830
+#: build/trans_presets.java:845 build/trans_presets.java:867
+#: build/trans_presets.java:904 build/trans_presets.java:917
+#: build/trans_presets.java:929 build/trans_presets.java:941
+#: build/trans_presets.java:953 build/trans_presets.java:993
+#: build/trans_presets.java:1519
 msgid "Motorcycle"
 msgstr "Motorrad"
@@ -26310,20 +26658,20 @@
 #. item "Barriers/Bump Gate" check "Motorcar"
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:412 build/trans_presets.java:496
-#: build/trans_presets.java:530 build/trans_presets.java:824
-#: build/trans_presets.java:839 build/trans_presets.java:861
-#: build/trans_presets.java:898 build/trans_presets.java:911
-#: build/trans_presets.java:923 build/trans_presets.java:935
-#: build/trans_presets.java:947 build/trans_presets.java:987
+#: build/trans_presets.java:419 build/trans_presets.java:503
+#: build/trans_presets.java:537 build/trans_presets.java:831
+#: build/trans_presets.java:846 build/trans_presets.java:868
+#: build/trans_presets.java:905 build/trans_presets.java:918
+#: build/trans_presets.java:930 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:994
 msgid "Motorcar"
 msgstr "Automobil"
 
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:420
 msgid "Public Service Vehicles (psv)"
 msgstr "Öffentlicher Verkehr & Taxi"
 
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#: build/trans_presets.java:415
+#: build/trans_presets.java:422
 msgid "Min. speed (km/h)"
 msgstr "Min. Geschwindigkeit (km/h)"
@@ -26331,25 +26679,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#: build/trans_presets.java:416 build/trans_presets.java:456
+#: build/trans_presets.java:423 build/trans_presets.java:463
 msgid "Max. weight (tonnes)"
 msgstr "Max. Gewicht (Tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
-#: build/trans_presets.java:417
+#: build/trans_presets.java:424
 msgid "Max. axleload (tonnes)"
 msgstr "Max. Axlast (Tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:418
+#: build/trans_presets.java:425
 msgid "Max. Height (meters)"
 msgstr "Max. Höhe (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:419
+#: build/trans_presets.java:426
 msgid "Max. Width (meters)"
 msgstr "Max. Breite (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:420
+#: build/trans_presets.java:427
 msgid "Max. Length (meters)"
 msgstr "Max. Länge (Meter)"
@@ -26357,5 +26705,5 @@
 #. <separator/>
 #. item "Highways/Streets/Roundabout"
-#: build/trans_presets.java:423
+#: build/trans_presets.java:430
 msgid "Roundabout"
 msgstr "Kreisverkehr"
@@ -26366,8 +26714,9 @@
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
-#: build/trans_presets.java:428
+#: build/trans_presets.java:435
 msgid "Edit Junction"
 msgstr "Kreuzung bearbeiten"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. </rule>
 #.
@@ -26381,13 +26730,15 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:431 build/trans_style.java:418
+#: build/trans_presets.java:438 build/trans_style.java:418
 #: build/trans_style.java:424
 msgid "motorway"
 msgstr "Autobahn"
 
-#: build/trans_presets.java:431
+#. item "Highways/Streets/Roundabout" combo "Type" display value
+#: build/trans_presets.java:438
 msgid "motorway_link"
 msgstr "Autobahnanschluß"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -26402,13 +26753,15 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:431 build/trans_style.java:430
+#: build/trans_presets.java:438 build/trans_style.java:430
 #: build/trans_style.java:436
 msgid "trunk"
 msgstr "Schnellstraße"
 
-#: build/trans_presets.java:431
+#. item "Highways/Streets/Roundabout" combo "Type" display value
+#: build/trans_presets.java:438
 msgid "trunk_link"
 msgstr "Schnellstraßenanschluß"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -26423,13 +26776,15 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:431 build/trans_style.java:442
+#: build/trans_presets.java:438 build/trans_style.java:442
 #: build/trans_style.java:448
 msgid "primary"
 msgstr "Bundesstraße"
 
-#: build/trans_presets.java:431
+#. item "Highways/Streets/Roundabout" combo "Type" display value
+#: build/trans_presets.java:438
 msgid "primary_link"
 msgstr "Bundesstraßenanschluß"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -26444,9 +26799,10 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:431 build/trans_style.java:454
+#: build/trans_presets.java:438 build/trans_style.java:454
 #: build/trans_style.java:460
 msgid "secondary"
 msgstr "Landesstraße"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -26455,12 +26811,14 @@
 #. <condition k="highway" v="tertiary"/>
 #. color tertiary
-#: build/trans_presets.java:431 build/trans_style.java:466
+#: build/trans_presets.java:438 build/trans_style.java:466
 msgid "tertiary"
 msgstr "Kreisstraße"
 
-#: build/trans_presets.java:431
+#. item "Highways/Streets/Roundabout" combo "Type" display value
+#: build/trans_presets.java:438
 msgid "unclassified"
 msgstr "Verbindungsstraße"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. <icon src="misc/landmark/plant.png"/>
 #. </rule>
@@ -26469,12 +26827,14 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:431 build/trans_style.java:2712
+#: build/trans_presets.java:438 build/trans_style.java:2712
 msgid "residential"
 msgstr "Ortsstraße"
 
-#: build/trans_presets.java:431
+#. item "Highways/Streets/Roundabout" combo "Type" display value
+#: build/trans_presets.java:438
 msgid "living_street"
 msgstr "Spielstraße"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -26505,13 +26865,15 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:431 build/trans_style.java:508
+#: build/trans_presets.java:438 build/trans_style.java:508
 #: build/trans_style.java:3621
 msgid "service"
 msgstr "Service"
 
-#: build/trans_presets.java:431
+#. item "Highways/Streets/Roundabout" combo "Type" display value
+#: build/trans_presets.java:438
 msgid "bus_guideway"
 msgstr "Spurbus"
 
+#. item "Highways/Streets/Roundabout" combo "Type" display value
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
 #. </rule>
@@ -26531,5 +26893,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:431 build/trans_style.java:693
+#: build/trans_presets.java:438 build/trans_style.java:693
 #: build/trans_style.java:2767 build/trans_style.java:2768
 msgid "construction"
@@ -26541,22 +26903,25 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:456
 msgid "Edit Bridge"
 msgstr "Brücke bearbeiten"
 
-#: build/trans_presets.java:451
+#. item "Highways/Streets/Bridge" combo "Bridge" display value
+#: build/trans_presets.java:458
 msgid "viaduct"
 msgstr "Viadukt"
 
-#: build/trans_presets.java:451
+#. item "Highways/Streets/Bridge" combo "Bridge" display value
+#: build/trans_presets.java:458
 msgid "swing"
-msgstr ""
-
-#: build/trans_presets.java:451
+msgstr "Drehbrücke"
+
+#. item "Highways/Streets/Bridge" combo "Bridge" display value
+#: build/trans_presets.java:458
 msgid "aqueduct"
 msgstr "Aquädukt"
 
 #. item "Highways/Streets/Tunnel" label "Edit Tunnel"
-#: build/trans_presets.java:461
+#: build/trans_presets.java:468
 msgid "Edit Tunnel"
 msgstr "Tunnel bearbeiten"
@@ -26564,10 +26929,10 @@
 #. </optional>
 #. group "Ways"
-#: build/trans_presets.java:475
+#: build/trans_presets.java:482
 msgid "Ways"
 msgstr "Wege"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:476
+#: build/trans_presets.java:483
 msgid "Track"
 msgstr "Feld- oder Waldweg"
@@ -26576,30 +26941,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:479
+#: build/trans_presets.java:486
 msgid "Edit Track"
 msgstr "Feld- oder Waldweg bearbeiten"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:484
+#: build/trans_presets.java:491
 msgid "Tracktype"
 msgstr "Typ des Weges"
 
-#: build/trans_presets.java:484
+#. item "Ways/Track" combo "Tracktype" display value
+#: build/trans_presets.java:491
 msgid "grade1"
 msgstr "Grad 1 (Asphalt)"
 
-#: build/trans_presets.java:484
+#. item "Ways/Track" combo "Tracktype" display value
+#: build/trans_presets.java:491
 msgid "grade2"
 msgstr "Grad 2 (Schotter)"
 
-#: build/trans_presets.java:484
+#. item "Ways/Track" combo "Tracktype" display value
+#: build/trans_presets.java:491
 msgid "grade3"
 msgstr "Grad 3 (unbefestigt)"
 
-#: build/trans_presets.java:484
+#. item "Ways/Track" combo "Tracktype" display value
+#: build/trans_presets.java:491
 msgid "grade4"
 msgstr "Grad 4 (leicht bewachsen)"
 
-#: build/trans_presets.java:484
+#. item "Ways/Track" combo "Tracktype" display value
+#: build/trans_presets.java:491
 msgid "grade5"
 msgstr "Grad 5 (stark bewachsen)"
@@ -26607,5 +26977,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:486 build/trans_presets.java:516
+#: build/trans_presets.java:493 build/trans_presets.java:523
 msgid "MTB Scale"
 msgstr "MTB-Skala"
@@ -26613,5 +26983,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:500
+#: build/trans_presets.java:507
 msgid "Path"
 msgstr "Pfad"
@@ -26620,40 +26990,45 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
 #. item "Ways/Path" label "Edit Path"
-#: build/trans_presets.java:503
+#: build/trans_presets.java:510
 msgid "Edit Path"
 msgstr "Pfad bearbeiten"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:508
+#: build/trans_presets.java:515
 msgid "SAC Scale"
 msgstr "SAC-Skala"
 
-#: build/trans_presets.java:508
+#. item "Ways/Path" combo "SAC Scale" display value
+#: build/trans_presets.java:515
 msgid "T1 - hiking trail"
 msgstr "T1 - Bergweg"
 
-#: build/trans_presets.java:508
+#. item "Ways/Path" combo "SAC Scale" display value
+#: build/trans_presets.java:515
 msgid "T2 - mountain hiking trail"
 msgstr "T2 - anspruchsvoller Bergweg"
 
-#: build/trans_presets.java:508
-#, fuzzy
+#. item "Ways/Path" combo "SAC Scale" display value
+#: build/trans_presets.java:515
 msgid "T3 - difficult, exposed hiking trail"
-msgstr "T4 - schwieriger alpiner Steig"
-
-#: build/trans_presets.java:508
+msgstr "T3 - exponierter, schwieriger Bergweg"
+
+#. item "Ways/Path" combo "SAC Scale" display value
+#: build/trans_presets.java:515
 msgid "T4 - difficult, exposed, steep alpine trail"
 msgstr "T4 - schwieriger alpiner Steig"
 
-#: build/trans_presets.java:508
+#. item "Ways/Path" combo "SAC Scale" display value
+#: build/trans_presets.java:515
 msgid "T5 - difficult alpine trail with climbing"
 msgstr "T5 - schwieriger alpiner Steig mit Kletterstellen"
 
-#: build/trans_presets.java:508
+#. item "Ways/Path" combo "SAC Scale" display value
+#: build/trans_presets.java:515
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr "T6 - schwieriger, gefährlicher alpiner Steig mit Kletterstellen"
 
 #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description
-#: build/trans_presets.java:509
+#: build/trans_presets.java:516
 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
 msgstr ""
@@ -26661,5 +27036,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description
-#: build/trans_presets.java:510
+#: build/trans_presets.java:517
 msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
@@ -26670,5 +27045,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description
-#: build/trans_presets.java:511
+#: build/trans_presets.java:518
 msgid ""
 "exposed sites may be secured with ropes or chains, possible need to use "
@@ -26682,5 +27057,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description
-#: build/trans_presets.java:512
+#: build/trans_presets.java:519
 msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
@@ -26692,5 +27067,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description
-#: build/trans_presets.java:513
+#: build/trans_presets.java:520
 msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
@@ -26702,5 +27077,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description
-#: build/trans_presets.java:514
+#: build/trans_presets.java:521
 msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
@@ -26710,21 +27085,27 @@
 "Schrofengelände. Gletscher mit hoher Spalten- und Ausrutschgefahr."
 
-#: build/trans_presets.java:517
+#. item "Ways/Path" combo "Visibility" display value
+#: build/trans_presets.java:524
 msgid "excellent"
 msgstr "exzellent"
 
-#: build/trans_presets.java:517
+#. item "Ways/Path" combo "Visibility" display value
+#: build/trans_presets.java:524
 msgid "good"
 msgstr "gut"
 
-#: build/trans_presets.java:517 build/trans_presets.java:2667
+#. item "Ways/Path" combo "Visibility" display value
+#. item "Sport/Skiing" combo "Difficulty" display value
+#: build/trans_presets.java:524 build/trans_presets.java:2674
 msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:517
+#. item "Ways/Path" combo "Visibility" display value
+#: build/trans_presets.java:524
 msgid "bad"
 msgstr "schlecht"
 
-#: build/trans_presets.java:517
+#. item "Ways/Path" combo "Visibility" display value
+#: build/trans_presets.java:524
 msgid "horrible"
 msgstr "sehr schlecht"
@@ -26747,23 +27128,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:527 build/trans_presets.java:1762
-#: build/trans_presets.java:1780 build/trans_presets.java:1796
-#: build/trans_presets.java:1813 build/trans_presets.java:1831
-#: build/trans_presets.java:1848 build/trans_presets.java:1865
-#: build/trans_presets.java:1887 build/trans_presets.java:1910
-#: build/trans_presets.java:1929 build/trans_presets.java:1946
-#: build/trans_presets.java:1965 build/trans_presets.java:1984
-#: build/trans_presets.java:2000 build/trans_presets.java:2017
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:534 build/trans_presets.java:1769
+#: build/trans_presets.java:1787 build/trans_presets.java:1803
+#: build/trans_presets.java:1820 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1872
+#: build/trans_presets.java:1894 build/trans_presets.java:1917
+#: build/trans_presets.java:1936 build/trans_presets.java:1953
+#: build/trans_presets.java:1972 build/trans_presets.java:1991
+#: build/trans_presets.java:2007 build/trans_presets.java:2024
+#: build/trans_presets.java:2039
 msgid "Wheelchairs"
 msgstr "Rollstuhl"
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:535
 msgid "Ski"
 msgstr "Ski"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:529
+#: build/trans_presets.java:536
 msgid "Snowmobile"
 msgstr "Schneemobil"
@@ -26772,5 +27153,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:537
+#: build/trans_presets.java:544
 msgid "Dedicated Bridleway"
 msgstr "Ausgewiesener Reitweg"
@@ -26778,5 +27159,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
-#: build/trans_presets.java:539
+#: build/trans_presets.java:546
 msgid "Edit Bridleway"
 msgstr "Reitweg bearbeiten"
@@ -26784,5 +27165,5 @@
 #. </optional>
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:556
+#: build/trans_presets.java:563
 msgid "Dedicated Cycleway"
 msgstr "Ausgewiesener Fahrradweg"
@@ -26800,11 +27181,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:560 build/trans_presets.java:581
-#: build/trans_presets.java:604
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:611
 msgid "Edit Cycleway"
 msgstr "Fahrradweg bearbeiten"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:572
+#: build/trans_presets.java:579
 msgid "Pedestrians"
 msgstr "Fußgänger"
@@ -26812,5 +27193,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:577
+#: build/trans_presets.java:584
 msgid "Segregated Foot- and Cycleway"
 msgstr "Geteilter Fuß- und Fahradweg"
@@ -26818,5 +27199,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:600
+#: build/trans_presets.java:607
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinierter Fuß- und Fahrradweg"
@@ -26824,5 +27205,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:624
+#: build/trans_presets.java:631
 msgid "Dedicated Footway"
 msgstr "Ausgewiesener Fußweg"
@@ -26831,5 +27212,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:627
+#: build/trans_presets.java:634
 msgid "Edit Footway"
 msgstr "Fußweg bearbeiten"
@@ -26837,5 +27218,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:643
+#: build/trans_presets.java:650
 msgid "Steps"
 msgstr "Treppe"
@@ -26845,15 +27226,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:647
+#: build/trans_presets.java:654
 msgid "Edit Flight of Steps"
 msgstr "Treppe bearbeiten"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:661
+#: build/trans_presets.java:668
 msgid "Amount of Steps"
 msgstr "Stufenzahl"
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:666
+#: build/trans_presets.java:673
 msgid "Motorway Junction"
 msgstr "Anschlussstelle"
@@ -26861,10 +27242,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:668
+#: build/trans_presets.java:675
 msgid "Edit Motorway Junction"
 msgstr "Anschlussstelle bearbeiten"
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:674
+#: build/trans_presets.java:681
 msgid "Services"
 msgstr "Rastplatz / Autohof"
@@ -26872,5 +27253,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:676
+#: build/trans_presets.java:683
 msgid "Edit Service Station"
 msgstr "Rastplatz / Autohof bearbeiten"
@@ -26960,40 +27341,40 @@
 #. item "Relations/Route" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:681 build/trans_presets.java:848
-#: build/trans_presets.java:1426 build/trans_presets.java:1450
-#: build/trans_presets.java:1459 build/trans_presets.java:1468
-#: build/trans_presets.java:1475 build/trans_presets.java:1483
-#: build/trans_presets.java:1499 build/trans_presets.java:1508
-#: build/trans_presets.java:1527 build/trans_presets.java:1659
-#: build/trans_presets.java:1756 build/trans_presets.java:1774
-#: build/trans_presets.java:1825 build/trans_presets.java:1842
-#: build/trans_presets.java:1901 build/trans_presets.java:1922
-#: build/trans_presets.java:1958 build/trans_presets.java:1977
-#: build/trans_presets.java:2109 build/trans_presets.java:2119
-#: build/trans_presets.java:2169 build/trans_presets.java:2254
-#: build/trans_presets.java:2279 build/trans_presets.java:2322
-#: build/trans_presets.java:2355 build/trans_presets.java:2387
-#: build/trans_presets.java:2400 build/trans_presets.java:2411
-#: build/trans_presets.java:2430 build/trans_presets.java:2439
-#: build/trans_presets.java:2446 build/trans_presets.java:2739
-#: build/trans_presets.java:2748 build/trans_presets.java:2870
-#: build/trans_presets.java:2889 build/trans_presets.java:2908
-#: build/trans_presets.java:2926 build/trans_presets.java:2937
-#: build/trans_presets.java:2953 build/trans_presets.java:3009
-#: build/trans_presets.java:3044 build/trans_presets.java:3052
-#: build/trans_presets.java:3060 build/trans_presets.java:3085
-#: build/trans_presets.java:3200 build/trans_presets.java:3209
-#: build/trans_presets.java:3226 build/trans_presets.java:3235
-#: build/trans_presets.java:3272 build/trans_presets.java:3321
-#: build/trans_presets.java:3344 build/trans_presets.java:3353
-#: build/trans_presets.java:3375 build/trans_presets.java:3390
-#: build/trans_presets.java:3400 build/trans_presets.java:3409
-#: build/trans_presets.java:3437 build/trans_presets.java:3446
-#: build/trans_presets.java:3485 build/trans_presets.java:3501
-#: build/trans_presets.java:3510 build/trans_presets.java:3519
-#: build/trans_presets.java:3535 build/trans_presets.java:3557
-#: build/trans_presets.java:3572 build/trans_presets.java:3581
-#: build/trans_presets.java:3849 build/trans_presets.java:3942
-#: build/trans_presets.java:4086 build/trans_presets.java:4106
+#: build/trans_presets.java:688 build/trans_presets.java:855
+#: build/trans_presets.java:1433 build/trans_presets.java:1457
+#: build/trans_presets.java:1466 build/trans_presets.java:1475
+#: build/trans_presets.java:1482 build/trans_presets.java:1490
+#: build/trans_presets.java:1506 build/trans_presets.java:1515
+#: build/trans_presets.java:1534 build/trans_presets.java:1666
+#: build/trans_presets.java:1763 build/trans_presets.java:1781
+#: build/trans_presets.java:1832 build/trans_presets.java:1849
+#: build/trans_presets.java:1908 build/trans_presets.java:1929
+#: build/trans_presets.java:1965 build/trans_presets.java:1984
+#: build/trans_presets.java:2116 build/trans_presets.java:2126
+#: build/trans_presets.java:2176 build/trans_presets.java:2261
+#: build/trans_presets.java:2286 build/trans_presets.java:2329
+#: build/trans_presets.java:2362 build/trans_presets.java:2394
+#: build/trans_presets.java:2407 build/trans_presets.java:2418
+#: build/trans_presets.java:2437 build/trans_presets.java:2446
+#: build/trans_presets.java:2453 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2877
+#: build/trans_presets.java:2896 build/trans_presets.java:2915
+#: build/trans_presets.java:2933 build/trans_presets.java:2944
+#: build/trans_presets.java:2960 build/trans_presets.java:3016
+#: build/trans_presets.java:3051 build/trans_presets.java:3059
+#: build/trans_presets.java:3067 build/trans_presets.java:3092
+#: build/trans_presets.java:3207 build/trans_presets.java:3216
+#: build/trans_presets.java:3233 build/trans_presets.java:3242
+#: build/trans_presets.java:3279 build/trans_presets.java:3328
+#: build/trans_presets.java:3351 build/trans_presets.java:3360
+#: build/trans_presets.java:3382 build/trans_presets.java:3397
+#: build/trans_presets.java:3407 build/trans_presets.java:3416
+#: build/trans_presets.java:3444 build/trans_presets.java:3453
+#: build/trans_presets.java:3492 build/trans_presets.java:3508
+#: build/trans_presets.java:3517 build/trans_presets.java:3526
+#: build/trans_presets.java:3542 build/trans_presets.java:3564
+#: build/trans_presets.java:3579 build/trans_presets.java:3588
+#: build/trans_presets.java:3856 build/trans_presets.java:3949
+#: build/trans_presets.java:4093 build/trans_presets.java:4113
 msgid "Operator"
 msgstr "Betreiber"
@@ -27002,5 +27383,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:692
 msgid "Rest Area"
 msgstr "Raststelle"
@@ -27008,5 +27389,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:694
 msgid "Edit Rest Area"
 msgstr "Raststelle bearbeiten"
@@ -27015,5 +27396,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:702
 msgid "Emergency Phone"
 msgstr "Notfalltelefon"
@@ -27023,5 +27404,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:700
+#: build/trans_presets.java:707
 msgid "Traffic Signal"
 msgstr "Ampel"
@@ -27031,25 +27412,37 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:711
 msgid "Pedestrian crossing type"
 msgstr "Typ des Fußgängerüberwegs"
 
-#: build/trans_presets.java:704 build/trans_presets.java:726
-#: build/trans_presets.java:1338
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#: build/trans_presets.java:711 build/trans_presets.java:733
+#: build/trans_presets.java:1345
 msgid "uncontrolled"
 msgstr "unkontrolliert"
 
-#: build/trans_presets.java:704 build/trans_presets.java:726
-#: build/trans_presets.java:1338
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#: build/trans_presets.java:711 build/trans_presets.java:733
+#: build/trans_presets.java:1345
 msgid "traffic_signals"
 msgstr "Ampel"
 
-#: build/trans_presets.java:704 build/trans_presets.java:726
-#: build/trans_presets.java:1338
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#: build/trans_presets.java:711 build/trans_presets.java:733
+#: build/trans_presets.java:1345
 msgid "island"
 msgstr "Insel"
 
-#: build/trans_presets.java:704 build/trans_presets.java:726
-#: build/trans_presets.java:1338
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#: build/trans_presets.java:711 build/trans_presets.java:733
+#: build/trans_presets.java:1345
 msgid "unmarked"
 msgstr "unmarkiert"
@@ -27058,6 +27451,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:705 build/trans_presets.java:728
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:712 build/trans_presets.java:735
+#: build/trans_presets.java:1346
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
@@ -27066,6 +27459,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:706 build/trans_presets.java:727
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1347
 msgid "Cross by bicycle"
 msgstr "Mit Fahrrad"
@@ -27074,35 +27467,47 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:707 build/trans_presets.java:729
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:714 build/trans_presets.java:736
+#: build/trans_presets.java:1348
 msgid "Crossing attendant"
 msgstr "Schülerlotse"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:708
+#: build/trans_presets.java:715
 msgid "Crossing type name (UK)"
 msgstr "Übergangstyp (UK)"
 
-#: build/trans_presets.java:708 build/trans_presets.java:730
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
+#: build/trans_presets.java:715 build/trans_presets.java:737
 msgid "zebra"
 msgstr "Zebrastreifen"
 
-#: build/trans_presets.java:708 build/trans_presets.java:730
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
+#: build/trans_presets.java:715 build/trans_presets.java:737
 msgid "pelican"
 msgstr "Ampel (Pelikan)"
 
-#: build/trans_presets.java:708 build/trans_presets.java:730
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
+#: build/trans_presets.java:715 build/trans_presets.java:737
 msgid "toucan"
 msgstr "Fußgängerampel (Toukan)"
 
-#: build/trans_presets.java:708 build/trans_presets.java:730
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
+#: build/trans_presets.java:715 build/trans_presets.java:737
 msgid "puffin"
 msgstr "Fußgängerampel (Puffin)"
 
-#: build/trans_presets.java:708 build/trans_presets.java:730
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
+#: build/trans_presets.java:715 build/trans_presets.java:737
 msgid "pegasus"
 msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
 
-#: build/trans_presets.java:708 build/trans_presets.java:730
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
+#: build/trans_presets.java:715 build/trans_presets.java:737
 msgid "tiger"
 msgstr "Zebrastreifen (Tiger)"
@@ -27110,5 +27515,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:711
+#: build/trans_presets.java:718
 msgid "Stop"
 msgstr "Stopp-Schild"
@@ -27116,5 +27521,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:714
+#: build/trans_presets.java:721
 msgid "Mini-roundabout"
 msgstr "Kleiner Kreisverkehr"
@@ -27125,14 +27530,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:719
+#: build/trans_presets.java:726
 msgid "Direction"
 msgstr "Richtung"
 
-#: build/trans_presets.java:719
+#. item "Waypoints/Mini-roundabout" combo "Direction" display value
+#: build/trans_presets.java:726
 msgid "clockwise"
 msgstr "Im Uhrzeigersinn"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:721
+#: build/trans_presets.java:728
 msgid "Pedestrian Crossing"
 msgstr "Fußgängerüberweg"
@@ -27141,15 +27547,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:724
+#: build/trans_presets.java:731
 msgid "Edit Crossing"
 msgstr "Fußgängerüberweg bearbeiten"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:730
+#: build/trans_presets.java:737
 msgid "Type name (UK)"
 msgstr "Typname (UK)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:732
+#: build/trans_presets.java:739
 msgid "Traffic Calming"
 msgstr "Verkehrsberuhigung"
@@ -27157,34 +27563,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:741
 msgid "Edit Traffic Calming"
 msgstr "Verkehrsberuhigung bearbeiten"
 
-#: build/trans_presets.java:735
+#. item "Waypoints/Traffic Calming" combo "Type" display value
+#: build/trans_presets.java:742
 msgid "bump"
 msgstr "Bodenschwelle"
 
-#: build/trans_presets.java:735
+#. item "Waypoints/Traffic Calming" combo "Type" display value
+#: build/trans_presets.java:742
 msgid "chicane"
 msgstr "Schikane"
 
-#: build/trans_presets.java:735
+#. item "Waypoints/Traffic Calming" combo "Type" display value
+#: build/trans_presets.java:742
 msgid "choker"
 msgstr "Fahrbahnverengung"
 
-#: build/trans_presets.java:735
+#. item "Waypoints/Traffic Calming" combo "Type" display value
+#: build/trans_presets.java:742
 msgid "cushion"
 msgstr "Bodenwelle (mit Lücken)"
 
-#: build/trans_presets.java:735
+#. item "Waypoints/Traffic Calming" combo "Type" display value
+#: build/trans_presets.java:742
 msgid "hump"
 msgstr "Bodenwelle (lang)"
 
-#: build/trans_presets.java:735
+#. item "Waypoints/Traffic Calming" combo "Type" display value
+#: build/trans_presets.java:742
 msgid "table"
 msgstr "Bodenwelle (sehr lang und flach)"
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:744
 msgid "Passing Place"
 msgstr "Ausweichstelle"
@@ -27192,5 +27604,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:739
+#: build/trans_presets.java:746
 msgid "Edit Passing Place"
 msgstr "Ausweichstelle bearbeiten"
@@ -27198,5 +27610,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:742
+#: build/trans_presets.java:749
 msgid "Turning Circle"
 msgstr "Wendestelle"
@@ -27206,5 +27618,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:747
+#: build/trans_presets.java:754
 msgid "City Limit"
 msgstr "Ortseingangsschild"
@@ -27212,15 +27624,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:756
 msgid "Edit City Limit Sign"
 msgstr "Ortseingangsschild bearbeiten"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:754
+#: build/trans_presets.java:761
 msgid "Second Name"
 msgstr "Zweiter Name"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:763
 msgid "Speed Camera"
 msgstr "Geschwindigkeitsüberwachung"
@@ -27230,5 +27642,5 @@
 #. <separator/>
 #. item "Waypoints/Incline"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:768
 msgid "Incline"
 msgstr "Steigung"
@@ -27236,5 +27648,5 @@
 #. <key key="highway" value="incline" />
 #. item "Waypoints/Incline Steep"
-#: build/trans_presets.java:764
+#: build/trans_presets.java:771
 msgid "Incline Steep"
 msgstr "Starke Steigung"
@@ -27242,5 +27654,5 @@
 #. <key key="highway" value="incline_steep" />
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:767
+#: build/trans_presets.java:774
 msgid "Grit Bin"
 msgstr "Splittbehälter"
@@ -27250,10 +27662,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:779
 msgid "Ford"
 msgstr "Furt"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:780
 msgid "Edit Ford"
 msgstr "Furt bearbeiten"
@@ -27261,5 +27673,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:780
+#: build/trans_presets.java:787
 msgid "Mountain Pass"
 msgstr "Gebirgspass"
@@ -27267,5 +27679,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:782
+#: build/trans_presets.java:789
 msgid "Edit Mountain Pass"
 msgstr "Gebirgspass bearbeiten"
@@ -27277,7 +27689,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:787 build/trans_presets.java:1843
-#: build/trans_presets.java:2092 build/trans_presets.java:3715
-#: build/trans_presets.java:3723 build/trans_presets.java:3731
+#: build/trans_presets.java:794 build/trans_presets.java:1850
+#: build/trans_presets.java:2099 build/trans_presets.java:3722
+#: build/trans_presets.java:3730 build/trans_presets.java:3738
 msgid "Elevation"
 msgstr "Höhe"
@@ -27311,18 +27723,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:788 build/trans_presets.java:1026
-#: build/trans_presets.java:1037 build/trans_presets.java:1051
-#: build/trans_presets.java:1066 build/trans_presets.java:1685
-#: build/trans_presets.java:2148 build/trans_presets.java:2208
-#: build/trans_presets.java:3100 build/trans_presets.java:3631
-#: build/trans_presets.java:3638 build/trans_presets.java:3645
-#: build/trans_presets.java:3652 build/trans_presets.java:3659
-#: build/trans_presets.java:3667 build/trans_presets.java:3675
-#: build/trans_presets.java:3683 build/trans_presets.java:3690
-#: build/trans_presets.java:3697 build/trans_presets.java:3706
-#: build/trans_presets.java:3716 build/trans_presets.java:3724
-#: build/trans_presets.java:3732 build/trans_presets.java:3739
-#: build/trans_presets.java:3748 build/trans_presets.java:3756
-#: build/trans_presets.java:4021
+#: build/trans_presets.java:795 build/trans_presets.java:1033
+#: build/trans_presets.java:1044 build/trans_presets.java:1058
+#: build/trans_presets.java:1073 build/trans_presets.java:1692
+#: build/trans_presets.java:2155 build/trans_presets.java:2215
+#: build/trans_presets.java:3107 build/trans_presets.java:3638
+#: build/trans_presets.java:3645 build/trans_presets.java:3652
+#: build/trans_presets.java:3659 build/trans_presets.java:3666
+#: build/trans_presets.java:3674 build/trans_presets.java:3682
+#: build/trans_presets.java:3690 build/trans_presets.java:3697
+#: build/trans_presets.java:3704 build/trans_presets.java:3713
+#: build/trans_presets.java:3723 build/trans_presets.java:3731
+#: build/trans_presets.java:3739 build/trans_presets.java:3746
+#: build/trans_presets.java:3755 build/trans_presets.java:3763
+#: build/trans_presets.java:4028
 msgid "Wikipedia"
 msgstr "Wikipedia"
@@ -27330,5 +27742,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:799
 msgid "Barriers"
 msgstr "Barrieren"
@@ -27336,5 +27748,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:795
+#: build/trans_presets.java:802
 msgid "Bollard"
 msgstr "Poller"
@@ -27342,5 +27754,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:797
+#: build/trans_presets.java:804
 msgid "Edit Bollard"
 msgstr "Poller bearbeiten"
@@ -27385,16 +27797,16 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:800 build/trans_presets.java:819
-#: build/trans_presets.java:833 build/trans_presets.java:855
-#: build/trans_presets.java:892 build/trans_presets.java:905
-#: build/trans_presets.java:917 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:963 build/trans_presets.java:972
-#: build/trans_presets.java:981
+#: build/trans_presets.java:807 build/trans_presets.java:826
+#: build/trans_presets.java:840 build/trans_presets.java:862
+#: build/trans_presets.java:899 build/trans_presets.java:912
+#: build/trans_presets.java:924 build/trans_presets.java:936
+#: build/trans_presets.java:948 build/trans_presets.java:960
+#: build/trans_presets.java:970 build/trans_presets.java:979
+#: build/trans_presets.java:988
 msgid "Allowed traffic:"
 msgstr "Erlaubter Verkehr:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:814
 msgid "Cycle Barrier"
 msgstr "Umlaufgitter"
@@ -27403,5 +27815,5 @@
 #. <key key="barrier" value="cycle_barrier" />
 #. item "Barriers/Block"
-#: build/trans_presets.java:811
+#: build/trans_presets.java:818
 msgid "Block"
 msgstr "Steinblock"
@@ -27409,5 +27821,5 @@
 #. <key key="barrier" value="block" />
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:821
 msgid "Cattle Grid"
 msgstr "Viehgitter"
@@ -27415,10 +27827,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:823
 msgid "Edit Cattle Grid"
 msgstr "Viehgitter bearbeiten"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:826
+#: build/trans_presets.java:833
 msgid "Bus Trap"
 msgstr "Busschleuse"
@@ -27426,15 +27838,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:829
+#: build/trans_presets.java:836
 msgid "Spikes"
 msgstr "Spikes / Dornen"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:830
+#: build/trans_presets.java:837
 msgid "Edit Spikes"
 msgstr "Spikes / Dornen bearbeiten"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:848
 msgid "Toll Booth"
 msgstr "Mautstation"
@@ -27442,5 +27854,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:843
+#: build/trans_presets.java:850
 msgid "Edit Toll Booth"
 msgstr "Mautstation bearbeiten"
@@ -27448,10 +27860,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:851
+#: build/trans_presets.java:858
 msgid "Border Control"
 msgstr "Grenzkontolle"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:859
 msgid "Edit Border Control"
 msgstr "Grenzkontrolle bearbeiten"
@@ -27460,5 +27872,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:866
+#: build/trans_presets.java:873
 msgid "Hedge"
 msgstr "Hecke"
@@ -27469,22 +27881,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:870 build/trans_presets.java:872
+#: build/trans_presets.java:877 build/trans_presets.java:879
 msgid "Fence"
 msgstr "Zaun"
 
-#: build/trans_presets.java:872
+#. item "Barriers/Fence" combo "Fence" display value
+#: build/trans_presets.java:879
 msgid "fence"
 msgstr "Zaun"
 
-#: build/trans_presets.java:872
+#. item "Barriers/Fence" combo "Fence" display value
+#: build/trans_presets.java:879
 msgid "wood_fence"
 msgstr "Holzzaun"
 
-#: build/trans_presets.java:872
+#. item "Barriers/Fence" combo "Fence" display value
+#: build/trans_presets.java:879
 msgid "wire_fence"
 msgstr "Holzzaun"
 
 #. item "Barriers/Wall"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:881
 msgid "Wall"
 msgstr "Mauer"
@@ -27492,5 +27907,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:884
 msgid "City Wall"
 msgstr "Stadtmauer"
@@ -27499,5 +27914,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:888
 msgid "Retaining Wall"
 msgstr "Stützmauer"
@@ -27508,15 +27923,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:895
 msgid "Entrance"
 msgstr "Eingang"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:896
 msgid "Edit Entrance"
 msgstr "Eingang bearbeiten"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:907
 msgid "Gate"
 msgstr "Gatter / Tor"
@@ -27524,50 +27939,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:902
+#: build/trans_presets.java:909
 msgid "Edit Gate"
 msgstr "Gatter / Tor bearbeiten"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:913
+#: build/trans_presets.java:920
 msgid "Lift Gate"
 msgstr "Schlagbaum"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:914
+#: build/trans_presets.java:921
 msgid "Edit Lift Gate"
 msgstr "Schlagbaum bearbeiten"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:925
+#: build/trans_presets.java:932
 msgid "Hampshire Gate"
 msgstr "Drahtgatter"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:933
 msgid "Edit Hampshire Gate"
 msgstr "Drahtgatter bearbeiten"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:937
+#: build/trans_presets.java:944
 msgid "Bump Gate"
 msgstr "Fahrzeuggatter"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:938
+#: build/trans_presets.java:945
 msgid "Edit Bump Gate"
 msgstr "Fahrzeuggatter bearbeiten"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:956
 msgid "Kissing Gate"
 msgstr "Personengatter"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:950
+#: build/trans_presets.java:957
 msgid "Edit Kissing Gate"
 msgstr "Personengatter bearbeiten"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:965
 msgid "Stile"
 msgstr "Zauntreppe"
@@ -27575,25 +27990,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Edit Stile"
 msgstr "Zauntreppe bearbeiten"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Turnstile"
 msgstr "Drehsperre"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:976
 msgid "Edit Turnstile"
 msgstr "Drehsperre bearbeiten"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:977
+#: build/trans_presets.java:984
 msgid "Sally Port"
 msgstr "Durchgangsschleuse"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Sally Port"
 msgstr "Durchgangsschleuse bearbeiten"
@@ -27603,6 +28018,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:992 build/trans_presets.java:993
-#: build/trans_presets.java:1094
+#: build/trans_presets.java:999 build/trans_presets.java:1000
+#: build/trans_presets.java:1101
 msgid "Water"
 msgstr "Wasser"
@@ -27610,5 +28025,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:995
+#: build/trans_presets.java:1002
 msgid "Drain"
 msgstr "Abwassergraben"
@@ -27616,10 +28031,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1004
 msgid "Edit Drain"
 msgstr "Abwassergraben bearbeiten"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1010
 msgid "Ditch"
 msgstr "Wassergraben"
@@ -27627,10 +28042,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1012
 msgid "Edit Ditch"
 msgstr "Wassergraben bearbeiten"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1018
 msgid "Stream"
 msgstr "Bach"
@@ -27638,10 +28053,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1020
 msgid "Edit Stream"
 msgstr "Bach bearbeiten"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1026
 msgid "Canal"
 msgstr "Kanal"
@@ -27649,10 +28064,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1021
+#: build/trans_presets.java:1028
 msgid "Edit Canal"
 msgstr "Kanal bearbeiten"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:1035
 msgid "River"
 msgstr "Fluss"
@@ -27662,5 +28077,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1039
 msgid "Edit River"
 msgstr "Fluss bearbeiten"
@@ -27668,5 +28083,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1047
 msgid "Spring"
 msgstr "Quelle"
@@ -27674,20 +28089,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1049
 msgid "Edit Spring"
 msgstr "Quelle bearbeiten"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1053
 msgid "Waterfall"
 msgstr "Wasserfall"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1054
 msgid "Edit Waterfall"
 msgstr "Wasserfall bearbeiten"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1060
 msgid "Weir"
 msgstr "Wehr"
@@ -27695,10 +28110,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1062
 msgid "Edit Weir"
 msgstr "Wehr bearbeiten"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1060
+#: build/trans_presets.java:1067
 msgid "Dam"
 msgstr "Damm"
@@ -27706,10 +28121,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1069
 msgid "Edit Dam"
 msgstr "Damm bearbeiten"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1075
 msgid "Groyne"
 msgstr "Buhne"
@@ -27717,5 +28132,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1077
 msgid "Edit Groyne"
 msgstr "Bearbeite Buhne"
@@ -27725,15 +28140,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1082
 msgid "Basin"
 msgstr "Wasserbecken"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1076
+#: build/trans_presets.java:1083
 msgid "Edit Basin Landuse"
 msgstr "Wasserbecken bearbeiten"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1088
 msgid "Reservoir"
 msgstr "Speicherbecken"
@@ -27741,15 +28156,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1083
+#: build/trans_presets.java:1090
 msgid "Edit Reservoir Landuse"
 msgstr "Speicherbecken bearbeiten"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1095
 msgid "Covered Reservoir"
 msgstr "Überdecktes Speicherbassin"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1096
 msgid "Edit Covered Reservoir"
 msgstr "Überdecktes Speicherbassin bearbeiten"
@@ -27757,20 +28172,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1103
 msgid "Edit Water"
 msgstr "Wasserfläche bearbeiten"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1107
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1108
 msgid "Edit Land"
 msgstr "Landfläche bearbeiten"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1105
+#: build/trans_presets.java:1112
 msgid "Coastline"
 msgstr "Küstenlinie"
@@ -27778,10 +28193,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1114
 msgid "Edit Coastline"
 msgstr "Küstenlinie bearbeiten"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1118
 msgid "Riverbank"
 msgstr "Flussbett"
@@ -27790,5 +28205,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1121
 msgid "Edit Riverbank"
 msgstr "Flussbett bearbeiten"
@@ -27796,5 +28211,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1126
 msgid "Wetland"
 msgstr "Feuchtgebiet"
@@ -27805,16 +28220,19 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1131
 msgid "Edit Wetland"
 msgstr "Feuchtgebiet bearbeiten"
 
-#: build/trans_presets.java:1127
+#. item "Water/Water/Wetland" combo "Type" display value
+#: build/trans_presets.java:1134
 msgid "swamp"
 msgstr "Sumpf"
 
-#: build/trans_presets.java:1127
+#. item "Water/Water/Wetland" combo "Type" display value
+#: build/trans_presets.java:1134
 msgid "bog"
 msgstr "Moor"
 
+#. item "Water/Water/Wetland" combo "Type" display value
 #. </rule>
 #.
@@ -27823,36 +28241,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1127 build/trans_style.java:2894
+#: build/trans_presets.java:1134 build/trans_style.java:2894
 msgid "marsh"
 msgstr "Marsch"
 
-#: build/trans_presets.java:1127
+#. item "Water/Water/Wetland" combo "Type" display value
+#: build/trans_presets.java:1134
 msgid "reedbed"
 msgstr "Röhricht"
 
-#: build/trans_presets.java:1127
+#. item "Water/Water/Wetland" combo "Type" display value
+#: build/trans_presets.java:1134
 msgid "saltmarsh"
 msgstr "Salzwiese"
 
-#: build/trans_presets.java:1127
+#. item "Water/Water/Wetland" combo "Type" display value
+#: build/trans_presets.java:1134
 msgid "tidalflat"
 msgstr "Watt"
 
-#: build/trans_presets.java:1127
+#. item "Water/Water/Wetland" combo "Type" display value
+#: build/trans_presets.java:1134
 msgid "mangrove"
 msgstr "Mangroven"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1129
+#: build/trans_presets.java:1136
 msgid "Mud"
 msgstr "Schlick & Moor"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1137
 msgid "Edit Mud"
 msgstr "Schlickiges Gebiet bearbeiten"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1141
 msgid "Beach"
 msgstr "Strand"
@@ -27860,20 +28282,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1143
 msgid "Edit Beach"
 msgstr "Strand bearbeiten"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1147
 msgid "Bay"
 msgstr "Meeresbucht"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1148
 msgid "Edit Bay"
 msgstr "Meeresbucht bearbeiten"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1152
 msgid "Cliff"
 msgstr "Klippe"
@@ -27881,15 +28303,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1154
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
 
 #. group "Shipping"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1159
 msgid "Shipping"
 msgstr "Schifffahrt"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1160
 msgid "Ferry Terminal"
 msgstr "Fährstelle"
@@ -27897,21 +28319,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1162
 msgid "Edit Ferry Terminal"
 msgstr "Fährstelle bearbeiten"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1165
 msgid "Cargo"
 msgstr "Fracht"
 
-#: build/trans_presets.java:1158
+#. item "Shipping/Ferry Terminal" combo "Cargo" display value
+#: build/trans_presets.java:1165
 msgid "passengers"
 msgstr "Passagiere"
 
-#: build/trans_presets.java:1158
+#. item "Shipping/Ferry Terminal" combo "Cargo" display value
+#: build/trans_presets.java:1165
 msgid "vehicle"
 msgstr "Fahrzeuge"
 
+#. item "Shipping/Ferry Terminal" combo "Cargo" display value
+#. item "Relations/Route" combo "Route type" display value
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. </rule>
@@ -27991,5 +28417,5 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1158 build/trans_presets.java:4079
+#: build/trans_presets.java:1165 build/trans_presets.java:4086
 #: build/trans_style.java:190 build/trans_style.java:520
 #: build/trans_style.java:540 build/trans_style.java:546
@@ -28001,14 +28427,16 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:1158
+#. item "Shipping/Ferry Terminal" combo "Cargo" display value
+#: build/trans_presets.java:1165
 msgid "hgv"
 msgstr "LKW"
 
-#: build/trans_presets.java:1158
+#. item "Shipping/Ferry Terminal" combo "Cargo" display value
+#: build/trans_presets.java:1165
 msgid "passengers;vehicle"
 msgstr "Passagiere&Fahrzeuge"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1167
 msgid "Ferry Route"
 msgstr "Fährroute"
@@ -28016,5 +28444,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1169
 msgid "Edit Ferry"
 msgstr "Fährroute bearbeiten"
@@ -28023,15 +28451,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1177
 msgid "Marina"
 msgstr "Jachthafen"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1178
 msgid "Edit Marina"
 msgstr "Jachthafen bearbeiten"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1182
 msgid "Pier"
 msgstr "Anlegestelle (Pier)"
@@ -28039,10 +28467,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1184
 msgid "Edit Pier"
 msgstr "Anlegestelle (Pier) bearbeiten"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1188
 msgid "Lock Gate"
 msgstr "Schleusentor"
@@ -28051,5 +28479,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1192
 msgid "Turning Point"
 msgstr "Wendepunkt"
@@ -28059,5 +28487,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1197
 msgid "Slipway"
 msgstr "Bootshebeanlage"
@@ -28067,10 +28495,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1201
 msgid "Edit Slipway"
 msgstr "Bootshebeanlage bearbeiten"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1205
 msgid "Boatyard"
 msgstr "Bootswerft"
@@ -28078,10 +28506,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1207
 msgid "Edit Boatyard"
 msgstr "Bootswerft bearbeiten"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1212
 msgid "Dock"
 msgstr "Dock"
@@ -28089,20 +28517,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1214
 msgid "Edit Dock"
 msgstr "Dock bearbeiten"
 
 #. group "Transport"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1221
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1222
 msgid "Railway"
 msgstr "Eisenbahn"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1223
 msgid "Rail"
 msgstr "Eisenbahn"
@@ -28110,5 +28538,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1225
 msgid "Edit Rail"
 msgstr "Eisenbahn bearbeiten"
@@ -28138,7 +28566,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1258 build/trans_presets.java:1270
-#: build/trans_presets.java:1282 build/trans_presets.java:1294
+#: build/trans_presets.java:1229 build/trans_presets.java:1241
+#: build/trans_presets.java:1265 build/trans_presets.java:1277
+#: build/trans_presets.java:1289 build/trans_presets.java:1301
 msgid "Gauge (mm)"
 msgstr "Spurweite (mm)"
@@ -28154,29 +28582,53 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1223 build/trans_presets.java:1235
-#: build/trans_presets.java:1247 build/trans_presets.java:1259
-#: build/trans_presets.java:1271 build/trans_presets.java:1283
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1266
+#: build/trans_presets.java:1278 build/trans_presets.java:1290
+#: build/trans_presets.java:1302
 msgid "Types"
 msgstr "Arten"
 
-#: build/trans_presets.java:1223 build/trans_presets.java:1235
-#: build/trans_presets.java:1247 build/trans_presets.java:1259
-#: build/trans_presets.java:1271 build/trans_presets.java:1283
-#: build/trans_presets.java:1295 build/trans_presets.java:1324
+#. item "Transport/Railway/Rail" combo "Types" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types" display value
+#. item "Transport/Railway/Monorail" combo "Types" display value
+#. item "Transport/Railway/Preserved" combo "Types" display value
+#. item "Transport/Railway/Light Rail" combo "Types" display value
+#. item "Transport/Railway/Subway" combo "Types" display value
+#. item "Transport/Railway/Tram" combo "Types" display value
+#. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1266
+#: build/trans_presets.java:1278 build/trans_presets.java:1290
+#: build/trans_presets.java:1302 build/trans_presets.java:1331
 msgid "yard"
 msgstr "Rangiergleis"
 
-#: build/trans_presets.java:1223 build/trans_presets.java:1235
-#: build/trans_presets.java:1247 build/trans_presets.java:1259
-#: build/trans_presets.java:1271 build/trans_presets.java:1283
-#: build/trans_presets.java:1295 build/trans_presets.java:1324
+#. item "Transport/Railway/Rail" combo "Types" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types" display value
+#. item "Transport/Railway/Monorail" combo "Types" display value
+#. item "Transport/Railway/Preserved" combo "Types" display value
+#. item "Transport/Railway/Light Rail" combo "Types" display value
+#. item "Transport/Railway/Subway" combo "Types" display value
+#. item "Transport/Railway/Tram" combo "Types" display value
+#. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1266
+#: build/trans_presets.java:1278 build/trans_presets.java:1290
+#: build/trans_presets.java:1302 build/trans_presets.java:1331
 msgid "siding"
 msgstr "Abstellgleis"
 
-#: build/trans_presets.java:1223 build/trans_presets.java:1235
-#: build/trans_presets.java:1247 build/trans_presets.java:1259
-#: build/trans_presets.java:1271 build/trans_presets.java:1283
-#: build/trans_presets.java:1295 build/trans_presets.java:1324
+#. item "Transport/Railway/Rail" combo "Types" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types" display value
+#. item "Transport/Railway/Monorail" combo "Types" display value
+#. item "Transport/Railway/Preserved" combo "Types" display value
+#. item "Transport/Railway/Light Rail" combo "Types" display value
+#. item "Transport/Railway/Subway" combo "Types" display value
+#. item "Transport/Railway/Tram" combo "Types" display value
+#. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1266
+#: build/trans_presets.java:1278 build/trans_presets.java:1290
+#: build/trans_presets.java:1302 build/trans_presets.java:1331
 msgid "spur"
 msgstr "Firmenanschlußgleis"
@@ -28189,18 +28641,32 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1224 build/trans_presets.java:1236
-#: build/trans_presets.java:1248 build/trans_presets.java:1260
-#: build/trans_presets.java:1272 build/trans_presets.java:1284
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1267
+#: build/trans_presets.java:1279 build/trans_presets.java:1291
+#: build/trans_presets.java:1303
 msgid "Electrified"
 msgstr "Elektrifiziert"
 
-#: build/trans_presets.java:1224 build/trans_presets.java:1236
-#: build/trans_presets.java:1248 build/trans_presets.java:1260
-#: build/trans_presets.java:1272 build/trans_presets.java:1284
-#: build/trans_presets.java:1296
+#. item "Transport/Railway/Rail" combo "Electrified" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified" display value
+#. item "Transport/Railway/Monorail" combo "Electrified" display value
+#. item "Transport/Railway/Preserved" combo "Electrified" display value
+#. item "Transport/Railway/Light Rail" combo "Electrified" display value
+#. item "Transport/Railway/Subway" combo "Electrified" display value
+#. item "Transport/Railway/Tram" combo "Electrified" display value
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1267
+#: build/trans_presets.java:1279 build/trans_presets.java:1291
+#: build/trans_presets.java:1303
 msgid "contact_line"
 msgstr "Oberleitung"
 
+#. item "Transport/Railway/Rail" combo "Electrified" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified" display value
+#. item "Transport/Railway/Monorail" combo "Electrified" display value
+#. item "Transport/Railway/Preserved" combo "Electrified" display value
+#. item "Transport/Railway/Light Rail" combo "Electrified" display value
+#. item "Transport/Railway/Subway" combo "Electrified" display value
+#. item "Transport/Railway/Tram" combo "Electrified" display value
 #. <icon annotate="true" src="transport/steps.png"/>
 #. </rule>
@@ -28251,8 +28717,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1224 build/trans_presets.java:1236
-#: build/trans_presets.java:1248 build/trans_presets.java:1260
-#: build/trans_presets.java:1272 build/trans_presets.java:1284
-#: build/trans_presets.java:1296 build/trans_style.java:590
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1267
+#: build/trans_presets.java:1279 build/trans_presets.java:1291
+#: build/trans_presets.java:1303 build/trans_style.java:590
 #: build/trans_style.java:953 build/trans_style.java:1003
 #: build/trans_style.java:1009 build/trans_style.java:1016
@@ -28272,9 +28738,9 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1225 build/trans_presets.java:1237
-#: build/trans_presets.java:1249 build/trans_presets.java:1261
-#: build/trans_presets.java:1273 build/trans_presets.java:1285
-#: build/trans_presets.java:1297 build/trans_presets.java:1451
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:1232 build/trans_presets.java:1244
+#: build/trans_presets.java:1256 build/trans_presets.java:1268
+#: build/trans_presets.java:1280 build/trans_presets.java:1292
+#: build/trans_presets.java:1304 build/trans_presets.java:1458
+#: build/trans_presets.java:3095
 msgid "Voltage"
 msgstr "Spannung"
@@ -28287,15 +28753,22 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250 build/trans_presets.java:1262
-#: build/trans_presets.java:1274 build/trans_presets.java:1286
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1233 build/trans_presets.java:1245
+#: build/trans_presets.java:1257 build/trans_presets.java:1269
+#: build/trans_presets.java:1281 build/trans_presets.java:1293
+#: build/trans_presets.java:1305
 msgid "Frequency (Hz)"
 msgstr "Frequenz (Hz)"
 
-#: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250 build/trans_presets.java:1262
-#: build/trans_presets.java:1274 build/trans_presets.java:1286
-#: build/trans_presets.java:1298
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)" display value
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)" display value
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)" display value
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)" display value
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)" display value
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
+#: build/trans_presets.java:1233 build/trans_presets.java:1245
+#: build/trans_presets.java:1257 build/trans_presets.java:1269
+#: build/trans_presets.java:1281 build/trans_presets.java:1293
+#: build/trans_presets.java:1305
 msgid "16.7"
 msgstr "16,7"
@@ -28303,10 +28776,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1236
 msgid "Narrow Gauge Rail"
 msgstr "Schmalspurbahn"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1237
 msgid "Edit Narrow Gauge Rail"
 msgstr "Schmalspurbahn bearbeiten"
@@ -28314,5 +28787,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1248
 msgid "Monorail"
 msgstr "Einschienenbahn"
@@ -28320,5 +28793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1250
 msgid "Edit Monorail"
 msgstr "Einschienenbahn bearbeiten"
@@ -28326,10 +28799,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1260
 msgid "Preserved"
 msgstr "Museumsbahn"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1261
 msgid "Edit Preserved Railway"
 msgstr "Museumsbahn bearbeiten"
@@ -28337,10 +28810,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1272
 msgid "Light Rail"
 msgstr "Stadtbahn"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1273
 msgid "Edit Light Rail"
 msgstr "Stadtbahn bearbeiten"
@@ -28348,10 +28821,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "U-Bahn"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "U-Bahn bearbeiten"
@@ -28359,10 +28832,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1296
 msgid "Tram"
 msgstr "Straßenbahn"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1297
 msgid "Edit Tram"
 msgstr "Straßenbahn bearbeiten"
@@ -28370,5 +28843,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1308
 msgid "Bus Guideway"
 msgstr "Spurbus"
@@ -28376,5 +28849,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1310
 msgid "Edit Bus Guideway"
 msgstr "Spurbusstrecke bearbeiten"
@@ -28383,10 +28856,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1327
 msgid "Disused Rail"
 msgstr "Stillgelegte Strecke"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1328
 msgid "Edit Disused Railway"
 msgstr "Stillgelegte Strecke bearbeiten"
@@ -28395,10 +28868,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1331
 msgid "Optional Types"
 msgstr "Optionale Typen"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1333
 msgid "Abandoned Rail"
 msgstr "Strecke abgebaut"
@@ -28407,5 +28880,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1337
 msgid "Level Crossing"
 msgstr "Bahnübergang"
@@ -28414,5 +28887,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1341
 msgid "Crossing"
 msgstr "(Fuß-)Übergang"
@@ -28422,5 +28895,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1345
 msgid "Crossing type"
 msgstr "Art des Übergangs"
@@ -28428,5 +28901,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1351
 msgid "Turntable"
 msgstr "Drehscheibe"
@@ -28435,5 +28908,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1355
 msgid "Buffer Stop"
 msgstr "Prellbock"
@@ -28442,10 +28915,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1360
 msgid "Aerialway"
 msgstr "Seilbahn"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1361
 msgid "Chair Lift"
 msgstr "Sessellift"
@@ -28453,10 +28926,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1363
 msgid "Edit Chair Lift"
 msgstr "Sessellift bearbeiten"
 
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1367
 msgid "Drag Lift"
 msgstr "Schlepplift"
@@ -28464,10 +28937,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1369
 msgid "Edit Drag Lift"
 msgstr "Schlepplift bearbeiten"
 
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1373
 msgid "Cable Car"
 msgstr "Kabinenbahn"
@@ -28475,10 +28948,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1375
 msgid "Edit Cable Car"
 msgstr "Kabinenbahn bearbeiten"
 
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1379
 msgid "Gondola"
 msgstr "Gondelbahn"
@@ -28486,5 +28959,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1381
 msgid "Edit Gondola"
 msgstr "Gondelbahn bearbeiten"
@@ -28492,5 +28965,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1386
 msgctxt "aerialway"
 msgid "Station"
@@ -28499,5 +28972,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1388
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -28505,5 +28978,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1392
 msgctxt "aerialway"
 msgid "Pylon"
@@ -28512,5 +28985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1394
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -28518,5 +28991,5 @@
 
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1391
+#: build/trans_presets.java:1398
 msgctxt "aerialway"
 msgid "Goods"
@@ -28524,5 +28997,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1399
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -28540,6 +29013,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1399 build/trans_presets.java:1513
-#: build/trans_presets.java:1545 build/trans_surveyor.java:24
+#: build/trans_presets.java:1406 build/trans_presets.java:1520
+#: build/trans_presets.java:1552 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parken"
@@ -28548,5 +29021,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1409
 msgid "Edit Parking"
 msgstr "Parken bearbeiten"
@@ -28557,24 +29030,30 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1405 build/trans_presets.java:2110
-#: build/trans_presets.java:2120 build/trans_presets.java:2431
-#: build/trans_presets.java:3582
+#: build/trans_presets.java:1412 build/trans_presets.java:2117
+#: build/trans_presets.java:2127 build/trans_presets.java:2438
+#: build/trans_presets.java:3589
 msgid "Reference number"
 msgstr "Referenznummer"
 
-#: build/trans_presets.java:1406 build/trans_presets.java:1518
+#. item "Car/Parking" combo "Type" display value
+#. item "Motorcycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1413 build/trans_presets.java:1525
 msgid "multi-storey"
 msgstr "Parkhaus"
 
-#: build/trans_presets.java:1406 build/trans_presets.java:1518
+#. item "Car/Parking" combo "Type" display value
+#. item "Motorcycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1413 build/trans_presets.java:1525
 msgid "surface"
 msgstr "ebenerdig"
 
-#: build/trans_presets.java:1406 build/trans_presets.java:1518
+#. item "Car/Parking" combo "Type" display value
+#. item "Motorcycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1413 build/trans_presets.java:1525
 msgid "underground"
 msgstr "Tiefgarage"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1414
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -28585,7 +29064,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1408 build/trans_presets.java:1519
-#: build/trans_presets.java:2111 build/trans_presets.java:2121
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:1415 build/trans_presets.java:1526
+#: build/trans_presets.java:2118 build/trans_presets.java:2128
+#: build/trans_presets.java:2439
 msgid "Fee"
 msgstr "Gebühr"
@@ -28593,25 +29072,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1417
 msgid "Capacity (overall)"
 msgstr "Gesamtkapazität"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1411
+#: build/trans_presets.java:1418
 msgid "Spaces for Disabled"
 msgstr "Behindertenparkplätze"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1419
 msgid "Spaces for Women"
 msgstr "Stellplätze für Frauen"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1420
 msgid "Spaces for Parents"
 msgstr "Stellplätze für Eltern"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1421
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Siehe Wiki für weitere Werte capacity:[types]=*."
@@ -28619,5 +29098,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1424
 msgid "Fuel"
 msgstr "Tankstelle"
@@ -28627,5 +29106,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1421
+#: build/trans_presets.java:1428
 msgid "Edit Fuel"
 msgstr "Tankstelle bearbeiten"
@@ -28639,96 +29118,118 @@
 #. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1423 build/trans_presets.java:1458
-#: build/trans_presets.java:1474 build/trans_presets.java:1482
-#: build/trans_presets.java:1498 build/trans_presets.java:1507
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1430 build/trans_presets.java:1465
+#: build/trans_presets.java:1481 build/trans_presets.java:1489
+#: build/trans_presets.java:1505 build/trans_presets.java:1514
+#: build/trans_presets.java:1533
 msgid "Brand"
 msgstr "Marke"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Chevron"
 msgstr "Chevron"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Citgo"
 msgstr "Citgo"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Exxon"
 msgstr "Exxon"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Gulf"
 msgstr "Gulf"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Mobil"
 msgstr "Mobil"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Petro-Canada"
 msgstr "Petro-Canada"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Pioneer"
 msgstr "Pioneer"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Sunoco"
 msgstr "Sunoco"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1423
+#. item "Car/Fuel" combo "Brand" display value
+#: build/trans_presets.java:1430
 msgid "Independent"
 msgstr "Unabhängig"
@@ -28821,262 +29322,496 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1427 build/trans_presets.java:1460
-#: build/trans_presets.java:1476 build/trans_presets.java:1484
-#: build/trans_presets.java:1500 build/trans_presets.java:1509
-#: build/trans_presets.java:1528 build/trans_presets.java:1904
-#: build/trans_presets.java:1924 build/trans_presets.java:1941
-#: build/trans_presets.java:1960 build/trans_presets.java:1979
-#: build/trans_presets.java:1995 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2045
-#: build/trans_presets.java:2060 build/trans_presets.java:2147
-#: build/trans_presets.java:2154 build/trans_presets.java:2170
-#: build/trans_presets.java:2207 build/trans_presets.java:2223
-#: build/trans_presets.java:2246 build/trans_presets.java:2280
-#: build/trans_presets.java:2365 build/trans_presets.java:2371
-#: build/trans_presets.java:2379 build/trans_presets.java:2388
-#: build/trans_presets.java:2401 build/trans_presets.java:2422
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:3106 build/trans_presets.java:3114
-#: build/trans_presets.java:3163 build/trans_presets.java:3170
-#: build/trans_presets.java:3177 build/trans_presets.java:3185
-#: build/trans_presets.java:3192 build/trans_presets.java:3201
-#: build/trans_presets.java:3210 build/trans_presets.java:3217
-#: build/trans_presets.java:3227 build/trans_presets.java:3236
-#: build/trans_presets.java:3242 build/trans_presets.java:3250
-#: build/trans_presets.java:3256 build/trans_presets.java:3264
-#: build/trans_presets.java:3273 build/trans_presets.java:3279
-#: build/trans_presets.java:3286 build/trans_presets.java:3292
-#: build/trans_presets.java:3300 build/trans_presets.java:3307
-#: build/trans_presets.java:3313 build/trans_presets.java:3322
-#: build/trans_presets.java:3330 build/trans_presets.java:3336
-#: build/trans_presets.java:3345 build/trans_presets.java:3354
-#: build/trans_presets.java:3360 build/trans_presets.java:3366
-#: build/trans_presets.java:3376 build/trans_presets.java:3384
-#: build/trans_presets.java:3401 build/trans_presets.java:3410
-#: build/trans_presets.java:3417 build/trans_presets.java:3423
-#: build/trans_presets.java:3429 build/trans_presets.java:3438
-#: build/trans_presets.java:3447 build/trans_presets.java:3455
-#: build/trans_presets.java:3462 build/trans_presets.java:3470
-#: build/trans_presets.java:3477 build/trans_presets.java:3486
-#: build/trans_presets.java:3493 build/trans_presets.java:3502
-#: build/trans_presets.java:3511 build/trans_presets.java:3520
-#: build/trans_presets.java:3527 build/trans_presets.java:3536
-#: build/trans_presets.java:3542 build/trans_presets.java:3549
-#: build/trans_presets.java:3558 build/trans_presets.java:3564
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:1434 build/trans_presets.java:1467
+#: build/trans_presets.java:1483 build/trans_presets.java:1491
+#: build/trans_presets.java:1507 build/trans_presets.java:1516
+#: build/trans_presets.java:1535 build/trans_presets.java:1911
+#: build/trans_presets.java:1931 build/trans_presets.java:1948
+#: build/trans_presets.java:1967 build/trans_presets.java:1986
+#: build/trans_presets.java:2002 build/trans_presets.java:2019
+#: build/trans_presets.java:2036 build/trans_presets.java:2052
+#: build/trans_presets.java:2067 build/trans_presets.java:2154
+#: build/trans_presets.java:2161 build/trans_presets.java:2177
+#: build/trans_presets.java:2214 build/trans_presets.java:2230
+#: build/trans_presets.java:2253 build/trans_presets.java:2287
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2386 build/trans_presets.java:2395
+#: build/trans_presets.java:2408 build/trans_presets.java:2429
+#: build/trans_presets.java:2574 build/trans_presets.java:2580
+#: build/trans_presets.java:3113 build/trans_presets.java:3121
+#: build/trans_presets.java:3170 build/trans_presets.java:3177
+#: build/trans_presets.java:3184 build/trans_presets.java:3192
+#: build/trans_presets.java:3199 build/trans_presets.java:3208
+#: build/trans_presets.java:3217 build/trans_presets.java:3224
+#: build/trans_presets.java:3234 build/trans_presets.java:3243
+#: build/trans_presets.java:3249 build/trans_presets.java:3257
+#: build/trans_presets.java:3263 build/trans_presets.java:3271
+#: build/trans_presets.java:3280 build/trans_presets.java:3286
+#: build/trans_presets.java:3293 build/trans_presets.java:3299
+#: build/trans_presets.java:3307 build/trans_presets.java:3314
+#: build/trans_presets.java:3320 build/trans_presets.java:3329
+#: build/trans_presets.java:3337 build/trans_presets.java:3343
+#: build/trans_presets.java:3352 build/trans_presets.java:3361
+#: build/trans_presets.java:3367 build/trans_presets.java:3373
+#: build/trans_presets.java:3383 build/trans_presets.java:3391
+#: build/trans_presets.java:3408 build/trans_presets.java:3417
+#: build/trans_presets.java:3424 build/trans_presets.java:3430
+#: build/trans_presets.java:3436 build/trans_presets.java:3445
+#: build/trans_presets.java:3454 build/trans_presets.java:3462
+#: build/trans_presets.java:3469 build/trans_presets.java:3477
+#: build/trans_presets.java:3484 build/trans_presets.java:3493
+#: build/trans_presets.java:3500 build/trans_presets.java:3509
+#: build/trans_presets.java:3518 build/trans_presets.java:3527
+#: build/trans_presets.java:3534 build/trans_presets.java:3543
+#: build/trans_presets.java:3549 build/trans_presets.java:3556
+#: build/trans_presets.java:3565 build/trans_presets.java:3571
+#: build/trans_presets.java:3580
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
 
-#: build/trans_presets.java:1427 build/trans_presets.java:1460
-#: build/trans_presets.java:1476 build/trans_presets.java:1484
-#: build/trans_presets.java:1500 build/trans_presets.java:1509
-#: build/trans_presets.java:1528 build/trans_presets.java:1904
-#: build/trans_presets.java:1924 build/trans_presets.java:1941
-#: build/trans_presets.java:1960 build/trans_presets.java:1979
-#: build/trans_presets.java:1995 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2060
-#: build/trans_presets.java:2147 build/trans_presets.java:2154
-#: build/trans_presets.java:2207 build/trans_presets.java:2223
-#: build/trans_presets.java:2246 build/trans_presets.java:2280
-#: build/trans_presets.java:2365 build/trans_presets.java:2371
-#: build/trans_presets.java:2379 build/trans_presets.java:2388
-#: build/trans_presets.java:2422 build/trans_presets.java:2567
-#: build/trans_presets.java:2573 build/trans_presets.java:3106
-#: build/trans_presets.java:3114 build/trans_presets.java:3163
-#: build/trans_presets.java:3170 build/trans_presets.java:3177
-#: build/trans_presets.java:3185 build/trans_presets.java:3192
-#: build/trans_presets.java:3201 build/trans_presets.java:3210
-#: build/trans_presets.java:3217 build/trans_presets.java:3227
-#: build/trans_presets.java:3236 build/trans_presets.java:3242
-#: build/trans_presets.java:3250 build/trans_presets.java:3256
-#: build/trans_presets.java:3264 build/trans_presets.java:3273
-#: build/trans_presets.java:3279 build/trans_presets.java:3286
-#: build/trans_presets.java:3292 build/trans_presets.java:3300
-#: build/trans_presets.java:3307 build/trans_presets.java:3313
-#: build/trans_presets.java:3322 build/trans_presets.java:3330
-#: build/trans_presets.java:3336 build/trans_presets.java:3345
-#: build/trans_presets.java:3354 build/trans_presets.java:3360
-#: build/trans_presets.java:3366 build/trans_presets.java:3376
-#: build/trans_presets.java:3384 build/trans_presets.java:3401
-#: build/trans_presets.java:3410 build/trans_presets.java:3417
-#: build/trans_presets.java:3423 build/trans_presets.java:3429
-#: build/trans_presets.java:3438 build/trans_presets.java:3447
-#: build/trans_presets.java:3455 build/trans_presets.java:3462
-#: build/trans_presets.java:3470 build/trans_presets.java:3477
-#: build/trans_presets.java:3486 build/trans_presets.java:3493
-#: build/trans_presets.java:3502 build/trans_presets.java:3511
-#: build/trans_presets.java:3520 build/trans_presets.java:3527
-#: build/trans_presets.java:3536 build/trans_presets.java:3542
-#: build/trans_presets.java:3549 build/trans_presets.java:3558
-#: build/trans_presets.java:3564 build/trans_presets.java:3573
+#. item "Car/Fuel" combo "Opening Hours" display value
+#. item "Car/Wash" combo "Opening Hours" display value
+#. item "Car/Repair" combo "Opening Hours" display value
+#. item "Car/Tyres" combo "Opening Hours" display value
+#. item "Car/Rental" combo "Opening Hours" display value
+#. item "Car/Sharing" combo "Opening Hours" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours" display value
+#. item "Food+Drinks/Restaurant" combo "Opening Hours" display value
+#. item "Food+Drinks/Fast Food" combo "Opening Hours" display value
+#. item "Food+Drinks/Food Court" combo "Opening Hours" display value
+#. item "Food+Drinks/Cafe" combo "Opening Hours" display value
+#. item "Food+Drinks/Pub" combo "Opening Hours" display value
+#. item "Food+Drinks/Biergarten" combo "Opening Hours" display value
+#. item "Food+Drinks/Bar" combo "Opening Hours" display value
+#. item "Food+Drinks/Nightclub" combo "Opening Hours" display value
+#. item "Tourism/Information Office" combo "Opening Hours" display value
+#. item "Leisure/Zoo" combo "Opening Hours" display value
+#. item "Leisure/Theme Park" combo "Opening Hours" display value
+#. item "Culture/Museum" combo "Opening Hours" display value
+#. item "Culture/Library" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Public Building/Community Centre" combo "Opening Hours" display value
+#. item "Health/Doctors" combo "Opening Hours" display value
+#. item "Health/Dentist" combo "Opening Hours" display value
+#. item "Health/Pharmacy" combo "Opening Hours" display value
+#. item "Health/Hearing Aids" combo "Opening Hours" display value
+#. item "Health/Veterinary" combo "Opening Hours" display value
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours" display value
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours" display value
+#. item "Historic Places/Ruins" combo "Opening Hours" display value
+#. item "Historic Places/Archaeological Site" combo "Opening Hours" display value
+#. item "Shops/Food/Supermarket" combo "Opening Hours" display value
+#. item "Shops/Food/Convenience Store" combo "Opening Hours" display value
+#. item "Shops/Food/Kiosk" combo "Opening Hours" display value
+#. item "Shops/Food/Baker" combo "Opening Hours" display value
+#. item "Shops/Food/Butcher" combo "Opening Hours" display value
+#. item "Shops/Food/Seafood" combo "Opening Hours" display value
+#. item "Shops/Food/Deli (Fine Food)" combo "Opening Hours" display value
+#. item "Shops/Food/Confectionery" combo "Opening Hours" display value
+#. item "Shops/Food/Marketplace" combo "Opening Hours" display value
+#. item "Shops/Food/Greengrocer" combo "Opening Hours" display value
+#. item "Shops/Food/Organic" combo "Opening Hours" display value
+#. item "Shops/Food/Alcohol" combo "Opening Hours" display value
+#. item "Shops/Food/Beverages" combo "Opening Hours" display value
+#. item "Clothes/Clothes" combo "Opening Hours" display value
+#. item "Clothes/Boutique" combo "Opening Hours" display value
+#. item "Clothes/Shoes" combo "Opening Hours" display value
+#. item "Clothes/Outdoor" combo "Opening Hours" display value
+#. item "Clothes/Sports" combo "Opening Hours" display value
+#. item "Clothes/Dry Cleaning" combo "Opening Hours" display value
+#. item "Clothes/Laundry" combo "Opening Hours" display value
+#. item "Clothes/Tailor" combo "Opening Hours" display value
+#. item "Clothes/Fabric" combo "Opening Hours" display value
+#. item "Electronic/Computer" combo "Opening Hours" display value
+#. item "Electronic/Electronics" combo "Opening Hours" display value
+#. item "Electronic/Mobile Phone" combo "Opening Hours" display value
+#. item "Electronic/Vacuum Cleaner" combo "Opening Hours" display value
+#. item "Electronic/Hifi" combo "Opening Hours" display value
+#. item "Electronic/Video" combo "Opening Hours" display value
+#. item "Cash/Bank" combo "Opening Hours" display value
+#. item "Cash/Money Exchange" combo "Opening Hours" display value
+#. item "Other/Department Store" combo "Opening Hours" display value
+#. item "Other/Mall" combo "Opening Hours" display value
+#. item "Other/Chemist" combo "Opening Hours" display value
+#. item "Other/Hairdresser" combo "Opening Hours" display value
+#. item "Other/Optician" combo "Opening Hours" display value
+#. item "Other/Jewelry" combo "Opening Hours" display value
+#. item "Other/Erotic" combo "Opening Hours" display value
+#. item "Other/Florist" combo "Opening Hours" display value
+#. item "Other/Garden Centre" combo "Opening Hours" display value
+#. item "Other/Do-it-yourself-store" combo "Opening Hours" display value
+#. item "Other/Hardware" combo "Opening Hours" display value
+#. item "Other/Paint" combo "Opening Hours" display value
+#. item "Other/Furniture" combo "Opening Hours" display value
+#. item "Other/Kitchen" combo "Opening Hours" display value
+#. item "Other/Curtain" combo "Opening Hours" display value
+#. item "Other/Frame" combo "Opening Hours" display value
+#. item "Other/Stationery" combo "Opening Hours" display value
+#. item "Other/Copyshop" combo "Opening Hours" display value
+#. item "Other/Book Store" combo "Opening Hours" display value
+#. item "Other/Travel Agency" combo "Opening Hours" display value
+#. item "Other/Musical Instrument" combo "Opening Hours" display value
+#. item "Other/Toys" combo "Opening Hours" display value
+#. item "Other/Variety Store" combo "Opening Hours" display value
+#: build/trans_presets.java:1434 build/trans_presets.java:1467
+#: build/trans_presets.java:1483 build/trans_presets.java:1491
+#: build/trans_presets.java:1507 build/trans_presets.java:1516
+#: build/trans_presets.java:1535 build/trans_presets.java:1911
+#: build/trans_presets.java:1931 build/trans_presets.java:1948
+#: build/trans_presets.java:1967 build/trans_presets.java:1986
+#: build/trans_presets.java:2002 build/trans_presets.java:2019
+#: build/trans_presets.java:2036 build/trans_presets.java:2067
+#: build/trans_presets.java:2154 build/trans_presets.java:2161
+#: build/trans_presets.java:2214 build/trans_presets.java:2230
+#: build/trans_presets.java:2253 build/trans_presets.java:2287
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2386 build/trans_presets.java:2395
+#: build/trans_presets.java:2429 build/trans_presets.java:2574
+#: build/trans_presets.java:2580 build/trans_presets.java:3113
+#: build/trans_presets.java:3121 build/trans_presets.java:3170
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3192 build/trans_presets.java:3199
+#: build/trans_presets.java:3208 build/trans_presets.java:3217
+#: build/trans_presets.java:3224 build/trans_presets.java:3234
+#: build/trans_presets.java:3243 build/trans_presets.java:3249
+#: build/trans_presets.java:3257 build/trans_presets.java:3263
+#: build/trans_presets.java:3271 build/trans_presets.java:3280
+#: build/trans_presets.java:3286 build/trans_presets.java:3293
+#: build/trans_presets.java:3299 build/trans_presets.java:3307
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3329 build/trans_presets.java:3337
+#: build/trans_presets.java:3343 build/trans_presets.java:3352
+#: build/trans_presets.java:3361 build/trans_presets.java:3367
+#: build/trans_presets.java:3373 build/trans_presets.java:3383
+#: build/trans_presets.java:3391 build/trans_presets.java:3408
+#: build/trans_presets.java:3417 build/trans_presets.java:3424
+#: build/trans_presets.java:3430 build/trans_presets.java:3436
+#: build/trans_presets.java:3445 build/trans_presets.java:3454
+#: build/trans_presets.java:3462 build/trans_presets.java:3469
+#: build/trans_presets.java:3477 build/trans_presets.java:3484
+#: build/trans_presets.java:3493 build/trans_presets.java:3500
+#: build/trans_presets.java:3509 build/trans_presets.java:3518
+#: build/trans_presets.java:3527 build/trans_presets.java:3534
+#: build/trans_presets.java:3543 build/trans_presets.java:3549
+#: build/trans_presets.java:3556 build/trans_presets.java:3565
+#: build/trans_presets.java:3571 build/trans_presets.java:3580
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1427 build/trans_presets.java:1460
-#: build/trans_presets.java:1476 build/trans_presets.java:1484
-#: build/trans_presets.java:1500 build/trans_presets.java:1509
-#: build/trans_presets.java:1528 build/trans_presets.java:1904
-#: build/trans_presets.java:1924 build/trans_presets.java:1941
-#: build/trans_presets.java:1960 build/trans_presets.java:1979
-#: build/trans_presets.java:1995 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2060
-#: build/trans_presets.java:2147 build/trans_presets.java:2154
-#: build/trans_presets.java:2170 build/trans_presets.java:2207
-#: build/trans_presets.java:2223 build/trans_presets.java:2246
-#: build/trans_presets.java:2280 build/trans_presets.java:2365
-#: build/trans_presets.java:2371 build/trans_presets.java:2379
-#: build/trans_presets.java:2388 build/trans_presets.java:2422
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:3106 build/trans_presets.java:3114
-#: build/trans_presets.java:3163 build/trans_presets.java:3170
-#: build/trans_presets.java:3177 build/trans_presets.java:3185
-#: build/trans_presets.java:3192 build/trans_presets.java:3201
-#: build/trans_presets.java:3210 build/trans_presets.java:3217
-#: build/trans_presets.java:3227 build/trans_presets.java:3236
-#: build/trans_presets.java:3242 build/trans_presets.java:3250
-#: build/trans_presets.java:3256 build/trans_presets.java:3264
-#: build/trans_presets.java:3273 build/trans_presets.java:3279
-#: build/trans_presets.java:3286 build/trans_presets.java:3292
-#: build/trans_presets.java:3300 build/trans_presets.java:3307
-#: build/trans_presets.java:3313 build/trans_presets.java:3322
-#: build/trans_presets.java:3330 build/trans_presets.java:3336
-#: build/trans_presets.java:3345 build/trans_presets.java:3354
-#: build/trans_presets.java:3360 build/trans_presets.java:3366
-#: build/trans_presets.java:3376 build/trans_presets.java:3384
-#: build/trans_presets.java:3401 build/trans_presets.java:3410
-#: build/trans_presets.java:3417 build/trans_presets.java:3423
-#: build/trans_presets.java:3429 build/trans_presets.java:3438
-#: build/trans_presets.java:3447 build/trans_presets.java:3455
-#: build/trans_presets.java:3462 build/trans_presets.java:3470
-#: build/trans_presets.java:3477 build/trans_presets.java:3486
-#: build/trans_presets.java:3493 build/trans_presets.java:3502
-#: build/trans_presets.java:3511 build/trans_presets.java:3520
-#: build/trans_presets.java:3527 build/trans_presets.java:3536
-#: build/trans_presets.java:3542 build/trans_presets.java:3549
-#: build/trans_presets.java:3558 build/trans_presets.java:3564
-#: build/trans_presets.java:3573
+#. item "Car/Fuel" combo "Opening Hours" display value
+#. item "Car/Wash" combo "Opening Hours" display value
+#. item "Car/Repair" combo "Opening Hours" display value
+#. item "Car/Tyres" combo "Opening Hours" display value
+#. item "Car/Rental" combo "Opening Hours" display value
+#. item "Car/Sharing" combo "Opening Hours" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours" display value
+#. item "Food+Drinks/Restaurant" combo "Opening Hours" display value
+#. item "Food+Drinks/Fast Food" combo "Opening Hours" display value
+#. item "Food+Drinks/Food Court" combo "Opening Hours" display value
+#. item "Food+Drinks/Cafe" combo "Opening Hours" display value
+#. item "Food+Drinks/Pub" combo "Opening Hours" display value
+#. item "Food+Drinks/Biergarten" combo "Opening Hours" display value
+#. item "Food+Drinks/Bar" combo "Opening Hours" display value
+#. item "Food+Drinks/Nightclub" combo "Opening Hours" display value
+#. item "Tourism/Information Office" combo "Opening Hours" display value
+#. item "Leisure/Zoo" combo "Opening Hours" display value
+#. item "Leisure/Theme Park" combo "Opening Hours" display value
+#. item "Leisure/Sauna" combo "Opening Hours" display value
+#. item "Culture/Museum" combo "Opening Hours" display value
+#. item "Culture/Library" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Public Building/Community Centre" combo "Opening Hours" display value
+#. item "Health/Doctors" combo "Opening Hours" display value
+#. item "Health/Dentist" combo "Opening Hours" display value
+#. item "Health/Pharmacy" combo "Opening Hours" display value
+#. item "Health/Hearing Aids" combo "Opening Hours" display value
+#. item "Health/Veterinary" combo "Opening Hours" display value
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours" display value
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours" display value
+#. item "Historic Places/Ruins" combo "Opening Hours" display value
+#. item "Historic Places/Archaeological Site" combo "Opening Hours" display value
+#. item "Shops/Food/Supermarket" combo "Opening Hours" display value
+#. item "Shops/Food/Convenience Store" combo "Opening Hours" display value
+#. item "Shops/Food/Kiosk" combo "Opening Hours" display value
+#. item "Shops/Food/Baker" combo "Opening Hours" display value
+#. item "Shops/Food/Butcher" combo "Opening Hours" display value
+#. item "Shops/Food/Seafood" combo "Opening Hours" display value
+#. item "Shops/Food/Deli (Fine Food)" combo "Opening Hours" display value
+#. item "Shops/Food/Confectionery" combo "Opening Hours" display value
+#. item "Shops/Food/Marketplace" combo "Opening Hours" display value
+#. item "Shops/Food/Greengrocer" combo "Opening Hours" display value
+#. item "Shops/Food/Organic" combo "Opening Hours" display value
+#. item "Shops/Food/Alcohol" combo "Opening Hours" display value
+#. item "Shops/Food/Beverages" combo "Opening Hours" display value
+#. item "Clothes/Clothes" combo "Opening Hours" display value
+#. item "Clothes/Boutique" combo "Opening Hours" display value
+#. item "Clothes/Shoes" combo "Opening Hours" display value
+#. item "Clothes/Outdoor" combo "Opening Hours" display value
+#. item "Clothes/Sports" combo "Opening Hours" display value
+#. item "Clothes/Dry Cleaning" combo "Opening Hours" display value
+#. item "Clothes/Laundry" combo "Opening Hours" display value
+#. item "Clothes/Tailor" combo "Opening Hours" display value
+#. item "Clothes/Fabric" combo "Opening Hours" display value
+#. item "Electronic/Computer" combo "Opening Hours" display value
+#. item "Electronic/Electronics" combo "Opening Hours" display value
+#. item "Electronic/Mobile Phone" combo "Opening Hours" display value
+#. item "Electronic/Vacuum Cleaner" combo "Opening Hours" display value
+#. item "Electronic/Hifi" combo "Opening Hours" display value
+#. item "Electronic/Video" combo "Opening Hours" display value
+#. item "Cash/Bank" combo "Opening Hours" display value
+#. item "Cash/Money Exchange" combo "Opening Hours" display value
+#. item "Other/Department Store" combo "Opening Hours" display value
+#. item "Other/Mall" combo "Opening Hours" display value
+#. item "Other/Chemist" combo "Opening Hours" display value
+#. item "Other/Hairdresser" combo "Opening Hours" display value
+#. item "Other/Optician" combo "Opening Hours" display value
+#. item "Other/Jewelry" combo "Opening Hours" display value
+#. item "Other/Erotic" combo "Opening Hours" display value
+#. item "Other/Florist" combo "Opening Hours" display value
+#. item "Other/Garden Centre" combo "Opening Hours" display value
+#. item "Other/Do-it-yourself-store" combo "Opening Hours" display value
+#. item "Other/Hardware" combo "Opening Hours" display value
+#. item "Other/Paint" combo "Opening Hours" display value
+#. item "Other/Furniture" combo "Opening Hours" display value
+#. item "Other/Kitchen" combo "Opening Hours" display value
+#. item "Other/Curtain" combo "Opening Hours" display value
+#. item "Other/Frame" combo "Opening Hours" display value
+#. item "Other/Stationery" combo "Opening Hours" display value
+#. item "Other/Copyshop" combo "Opening Hours" display value
+#. item "Other/Book Store" combo "Opening Hours" display value
+#. item "Other/Travel Agency" combo "Opening Hours" display value
+#. item "Other/Musical Instrument" combo "Opening Hours" display value
+#. item "Other/Toys" combo "Opening Hours" display value
+#. item "Other/Variety Store" combo "Opening Hours" display value
+#: build/trans_presets.java:1434 build/trans_presets.java:1467
+#: build/trans_presets.java:1483 build/trans_presets.java:1491
+#: build/trans_presets.java:1507 build/trans_presets.java:1516
+#: build/trans_presets.java:1535 build/trans_presets.java:1911
+#: build/trans_presets.java:1931 build/trans_presets.java:1948
+#: build/trans_presets.java:1967 build/trans_presets.java:1986
+#: build/trans_presets.java:2002 build/trans_presets.java:2019
+#: build/trans_presets.java:2036 build/trans_presets.java:2067
+#: build/trans_presets.java:2154 build/trans_presets.java:2161
+#: build/trans_presets.java:2177 build/trans_presets.java:2214
+#: build/trans_presets.java:2230 build/trans_presets.java:2253
+#: build/trans_presets.java:2287 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2386
+#: build/trans_presets.java:2395 build/trans_presets.java:2429
+#: build/trans_presets.java:2574 build/trans_presets.java:2580
+#: build/trans_presets.java:3113 build/trans_presets.java:3121
+#: build/trans_presets.java:3170 build/trans_presets.java:3177
+#: build/trans_presets.java:3184 build/trans_presets.java:3192
+#: build/trans_presets.java:3199 build/trans_presets.java:3208
+#: build/trans_presets.java:3217 build/trans_presets.java:3224
+#: build/trans_presets.java:3234 build/trans_presets.java:3243
+#: build/trans_presets.java:3249 build/trans_presets.java:3257
+#: build/trans_presets.java:3263 build/trans_presets.java:3271
+#: build/trans_presets.java:3280 build/trans_presets.java:3286
+#: build/trans_presets.java:3293 build/trans_presets.java:3299
+#: build/trans_presets.java:3307 build/trans_presets.java:3314
+#: build/trans_presets.java:3320 build/trans_presets.java:3329
+#: build/trans_presets.java:3337 build/trans_presets.java:3343
+#: build/trans_presets.java:3352 build/trans_presets.java:3361
+#: build/trans_presets.java:3367 build/trans_presets.java:3373
+#: build/trans_presets.java:3383 build/trans_presets.java:3391
+#: build/trans_presets.java:3408 build/trans_presets.java:3417
+#: build/trans_presets.java:3424 build/trans_presets.java:3430
+#: build/trans_presets.java:3436 build/trans_presets.java:3445
+#: build/trans_presets.java:3454 build/trans_presets.java:3462
+#: build/trans_presets.java:3469 build/trans_presets.java:3477
+#: build/trans_presets.java:3484 build/trans_presets.java:3493
+#: build/trans_presets.java:3500 build/trans_presets.java:3509
+#: build/trans_presets.java:3518 build/trans_presets.java:3527
+#: build/trans_presets.java:3534 build/trans_presets.java:3543
+#: build/trans_presets.java:3549 build/trans_presets.java:3556
+#: build/trans_presets.java:3565 build/trans_presets.java:3571
+#: build/trans_presets.java:3580
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1427 build/trans_presets.java:1460
-#: build/trans_presets.java:1476 build/trans_presets.java:1484
-#: build/trans_presets.java:1500 build/trans_presets.java:1509
-#: build/trans_presets.java:1528 build/trans_presets.java:1904
-#: build/trans_presets.java:1924 build/trans_presets.java:1941
-#: build/trans_presets.java:1960 build/trans_presets.java:1979
-#: build/trans_presets.java:1995 build/trans_presets.java:2012
-#: build/trans_presets.java:2029 build/trans_presets.java:2060
-#: build/trans_presets.java:2147 build/trans_presets.java:2154
-#: build/trans_presets.java:2207 build/trans_presets.java:2223
-#: build/trans_presets.java:2246 build/trans_presets.java:2365
-#: build/trans_presets.java:2371 build/trans_presets.java:2379
-#: build/trans_presets.java:2422 build/trans_presets.java:2567
-#: build/trans_presets.java:2573 build/trans_presets.java:3106
-#: build/trans_presets.java:3114 build/trans_presets.java:3163
-#: build/trans_presets.java:3170 build/trans_presets.java:3177
-#: build/trans_presets.java:3185 build/trans_presets.java:3192
-#: build/trans_presets.java:3217 build/trans_presets.java:3242
-#: build/trans_presets.java:3250 build/trans_presets.java:3256
-#: build/trans_presets.java:3264 build/trans_presets.java:3279
-#: build/trans_presets.java:3286 build/trans_presets.java:3292
-#: build/trans_presets.java:3300 build/trans_presets.java:3307
-#: build/trans_presets.java:3313 build/trans_presets.java:3330
-#: build/trans_presets.java:3336 build/trans_presets.java:3360
-#: build/trans_presets.java:3366 build/trans_presets.java:3376
-#: build/trans_presets.java:3384 build/trans_presets.java:3417
-#: build/trans_presets.java:3423 build/trans_presets.java:3429
-#: build/trans_presets.java:3455 build/trans_presets.java:3462
-#: build/trans_presets.java:3470 build/trans_presets.java:3477
-#: build/trans_presets.java:3493 build/trans_presets.java:3527
-#: build/trans_presets.java:3542 build/trans_presets.java:3549
-#: build/trans_presets.java:3564
+#. item "Car/Fuel" combo "Opening Hours" display value
+#. item "Car/Wash" combo "Opening Hours" display value
+#. item "Car/Repair" combo "Opening Hours" display value
+#. item "Car/Tyres" combo "Opening Hours" display value
+#. item "Car/Rental" combo "Opening Hours" display value
+#. item "Car/Sharing" combo "Opening Hours" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours" display value
+#. item "Food+Drinks/Restaurant" combo "Opening Hours" display value
+#. item "Food+Drinks/Fast Food" combo "Opening Hours" display value
+#. item "Food+Drinks/Food Court" combo "Opening Hours" display value
+#. item "Food+Drinks/Cafe" combo "Opening Hours" display value
+#. item "Food+Drinks/Pub" combo "Opening Hours" display value
+#. item "Food+Drinks/Biergarten" combo "Opening Hours" display value
+#. item "Food+Drinks/Bar" combo "Opening Hours" display value
+#. item "Food+Drinks/Nightclub" combo "Opening Hours" display value
+#. item "Tourism/Information Office" combo "Opening Hours" display value
+#. item "Leisure/Zoo" combo "Opening Hours" display value
+#. item "Leisure/Theme Park" combo "Opening Hours" display value
+#. item "Culture/Museum" combo "Opening Hours" display value
+#. item "Culture/Library" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Health/Doctors" combo "Opening Hours" display value
+#. item "Health/Dentist" combo "Opening Hours" display value
+#. item "Health/Pharmacy" combo "Opening Hours" display value
+#. item "Health/Veterinary" combo "Opening Hours" display value
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours" display value
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours" display value
+#. item "Historic Places/Ruins" combo "Opening Hours" display value
+#. item "Historic Places/Archaeological Site" combo "Opening Hours" display value
+#. item "Shops/Food/Supermarket" combo "Opening Hours" display value
+#. item "Shops/Food/Convenience Store" combo "Opening Hours" display value
+#. item "Shops/Food/Kiosk" combo "Opening Hours" display value
+#. item "Shops/Food/Baker" combo "Opening Hours" display value
+#. item "Shops/Food/Butcher" combo "Opening Hours" display value
+#. item "Shops/Food/Confectionery" combo "Opening Hours" display value
+#. item "Shops/Food/Organic" combo "Opening Hours" display value
+#. item "Shops/Food/Alcohol" combo "Opening Hours" display value
+#. item "Shops/Food/Beverages" combo "Opening Hours" display value
+#. item "Clothes/Clothes" combo "Opening Hours" display value
+#. item "Clothes/Shoes" combo "Opening Hours" display value
+#. item "Clothes/Outdoor" combo "Opening Hours" display value
+#. item "Clothes/Sports" combo "Opening Hours" display value
+#. item "Clothes/Dry Cleaning" combo "Opening Hours" display value
+#. item "Clothes/Laundry" combo "Opening Hours" display value
+#. item "Clothes/Tailor" combo "Opening Hours" display value
+#. item "Electronic/Computer" combo "Opening Hours" display value
+#. item "Electronic/Electronics" combo "Opening Hours" display value
+#. item "Electronic/Hifi" combo "Opening Hours" display value
+#. item "Electronic/Video" combo "Opening Hours" display value
+#. item "Cash/Bank" combo "Opening Hours" display value
+#. item "Cash/Money Exchange" combo "Opening Hours" display value
+#. item "Other/Chemist" combo "Opening Hours" display value
+#. item "Other/Hairdresser" combo "Opening Hours" display value
+#. item "Other/Optician" combo "Opening Hours" display value
+#. item "Other/Florist" combo "Opening Hours" display value
+#. item "Other/Garden Centre" combo "Opening Hours" display value
+#. item "Other/Do-it-yourself-store" combo "Opening Hours" display value
+#. item "Other/Hardware" combo "Opening Hours" display value
+#. item "Other/Furniture" combo "Opening Hours" display value
+#. item "Other/Stationery" combo "Opening Hours" display value
+#. item "Other/Book Store" combo "Opening Hours" display value
+#. item "Other/Travel Agency" combo "Opening Hours" display value
+#. item "Other/Toys" combo "Opening Hours" display value
+#: build/trans_presets.java:1434 build/trans_presets.java:1467
+#: build/trans_presets.java:1483 build/trans_presets.java:1491
+#: build/trans_presets.java:1507 build/trans_presets.java:1516
+#: build/trans_presets.java:1535 build/trans_presets.java:1911
+#: build/trans_presets.java:1931 build/trans_presets.java:1948
+#: build/trans_presets.java:1967 build/trans_presets.java:1986
+#: build/trans_presets.java:2002 build/trans_presets.java:2019
+#: build/trans_presets.java:2036 build/trans_presets.java:2067
+#: build/trans_presets.java:2154 build/trans_presets.java:2161
+#: build/trans_presets.java:2214 build/trans_presets.java:2230
+#: build/trans_presets.java:2253 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2386
+#: build/trans_presets.java:2429 build/trans_presets.java:2574
+#: build/trans_presets.java:2580 build/trans_presets.java:3113
+#: build/trans_presets.java:3121 build/trans_presets.java:3170
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3192 build/trans_presets.java:3199
+#: build/trans_presets.java:3224 build/trans_presets.java:3249
+#: build/trans_presets.java:3257 build/trans_presets.java:3263
+#: build/trans_presets.java:3271 build/trans_presets.java:3286
+#: build/trans_presets.java:3293 build/trans_presets.java:3299
+#: build/trans_presets.java:3307 build/trans_presets.java:3314
+#: build/trans_presets.java:3320 build/trans_presets.java:3337
+#: build/trans_presets.java:3343 build/trans_presets.java:3367
+#: build/trans_presets.java:3373 build/trans_presets.java:3383
+#: build/trans_presets.java:3391 build/trans_presets.java:3424
+#: build/trans_presets.java:3430 build/trans_presets.java:3436
+#: build/trans_presets.java:3462 build/trans_presets.java:3469
+#: build/trans_presets.java:3477 build/trans_presets.java:3484
+#: build/trans_presets.java:3500 build/trans_presets.java:3534
+#: build/trans_presets.java:3549 build/trans_presets.java:3556
+#: build/trans_presets.java:3571
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1435
 msgid "With shop"
 msgstr "Mit Geschäft"
 
-#: build/trans_presets.java:1428
+#. item "Car/Fuel" combo "With shop" display value
+#: build/trans_presets.java:1435
 msgid "convenience"
 msgstr "Waren des täglichen Bedarfs"
 
-#: build/trans_presets.java:1428
+#. item "Car/Fuel" combo "With shop" display value
+#: build/trans_presets.java:1435
 msgid "kiosk"
 msgstr "Kiosk"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1436
 msgid "Fuel types:"
 msgstr "Kraftstoffsorten:"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1437
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1438
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1439
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (teilweise synthetisch, V-Power etc.)"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1440
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel für LKW"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1441
 msgid "Octane 91"
 msgstr "Normalbenzin"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1435
+#: build/trans_presets.java:1442
 msgid "Octane 95"
 msgstr "Super"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1443
 msgid "Octane 98"
 msgstr "Super plus"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1444
 msgid "Octane 100"
 msgstr "100 Oktan"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1445
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1446
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1447
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Flüssiggas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1448
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (komprimiertes Erdgas)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1449
 msgid "1/25 mix (mofa/moped)"
 msgstr "1:25 Gemisch (Mofa/Moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1450
 msgid "1/50 mix (mofa/moped)"
 msgstr "1:50 Gemisch (Mofa/Moped)"
@@ -29084,5 +29819,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1453
 msgid "Charging Station"
 msgstr "Elektrotankstelle"
@@ -29090,20 +29825,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1455
 msgid "Edit Charging Station (for electric cars)"
 msgstr "Bearbeite Elektrotankstelle"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1452
+#: build/trans_presets.java:1459
 msgid "Amperage"
 msgstr "Stromstärke"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1461
 msgid "Wash"
 msgstr "Autowäsche"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1462
 msgid "Edit Car Wash"
 msgstr "Autowäsche bearbeiten"
@@ -29111,5 +29846,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1470
 msgid "Car Dealer"
 msgstr "Autohändler"
@@ -29117,5 +29852,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1472
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
@@ -29123,20 +29858,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1470 build/trans_presets.java:1532
+#: build/trans_presets.java:1477 build/trans_presets.java:1539
 msgid "Repair"
 msgstr "Werkstatt"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1478
 msgid "Edit Car Repair"
 msgstr "Autowerkstatt bearbeiten"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1485
 msgid "Tyres"
 msgstr "Reifenhändler"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1486
 msgid "Edit Tyres"
 msgstr "Reifenhändler bearbeiten"
@@ -29144,5 +29879,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1485 build/trans_presets.java:1537
+#: build/trans_presets.java:1492 build/trans_presets.java:1544
 msgid "Contact:"
 msgstr "Kontakt:"
@@ -29186,15 +29921,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1486 build/trans_presets.java:1538
-#: build/trans_presets.java:1764 build/trans_presets.java:1782
-#: build/trans_presets.java:1798 build/trans_presets.java:1815
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1872 build/trans_presets.java:1889
-#: build/trans_presets.java:1912 build/trans_presets.java:1931
-#: build/trans_presets.java:1948 build/trans_presets.java:1967
-#: build/trans_presets.java:1986 build/trans_presets.java:2002
-#: build/trans_presets.java:2019 build/trans_presets.java:2034
-#: build/trans_presets.java:2256 build/trans_presets.java:2412
-#: build/trans_presets.java:4015
+#: build/trans_presets.java:1493 build/trans_presets.java:1545
+#: build/trans_presets.java:1771 build/trans_presets.java:1789
+#: build/trans_presets.java:1805 build/trans_presets.java:1822
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1879 build/trans_presets.java:1896
+#: build/trans_presets.java:1919 build/trans_presets.java:1938
+#: build/trans_presets.java:1955 build/trans_presets.java:1974
+#: build/trans_presets.java:1993 build/trans_presets.java:2009
+#: build/trans_presets.java:2026 build/trans_presets.java:2041
+#: build/trans_presets.java:2263 build/trans_presets.java:2419
+#: build/trans_presets.java:4022
 msgid "Phone Number"
 msgstr "Telefonnummer"
@@ -29219,14 +29954,14 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1487 build/trans_presets.java:1539
-#: build/trans_presets.java:1765 build/trans_presets.java:1783
-#: build/trans_presets.java:1799 build/trans_presets.java:1816
-#: build/trans_presets.java:1834 build/trans_presets.java:1851
-#: build/trans_presets.java:1873 build/trans_presets.java:1890
-#: build/trans_presets.java:1913 build/trans_presets.java:1932
-#: build/trans_presets.java:1949 build/trans_presets.java:1968
-#: build/trans_presets.java:1987 build/trans_presets.java:2003
-#: build/trans_presets.java:2020 build/trans_presets.java:2035
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:1494 build/trans_presets.java:1546
+#: build/trans_presets.java:1772 build/trans_presets.java:1790
+#: build/trans_presets.java:1806 build/trans_presets.java:1823
+#: build/trans_presets.java:1841 build/trans_presets.java:1858
+#: build/trans_presets.java:1880 build/trans_presets.java:1897
+#: build/trans_presets.java:1920 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1975
+#: build/trans_presets.java:1994 build/trans_presets.java:2010
+#: build/trans_presets.java:2027 build/trans_presets.java:2042
+#: build/trans_presets.java:4023
 msgid "Fax Number"
 msgstr "Faxnummer"
@@ -29253,14 +29988,14 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1488 build/trans_presets.java:1540
-#: build/trans_presets.java:1766 build/trans_presets.java:1784
-#: build/trans_presets.java:1800 build/trans_presets.java:1817
-#: build/trans_presets.java:1835 build/trans_presets.java:1852
-#: build/trans_presets.java:1874 build/trans_presets.java:1891
-#: build/trans_presets.java:1914 build/trans_presets.java:1933
-#: build/trans_presets.java:1950 build/trans_presets.java:1969
-#: build/trans_presets.java:1988 build/trans_presets.java:2004
-#: build/trans_presets.java:2021 build/trans_presets.java:2036
-#: build/trans_presets.java:2257 build/trans_presets.java:4018
+#: build/trans_presets.java:1495 build/trans_presets.java:1547
+#: build/trans_presets.java:1773 build/trans_presets.java:1791
+#: build/trans_presets.java:1807 build/trans_presets.java:1824
+#: build/trans_presets.java:1842 build/trans_presets.java:1859
+#: build/trans_presets.java:1881 build/trans_presets.java:1898
+#: build/trans_presets.java:1921 build/trans_presets.java:1940
+#: build/trans_presets.java:1957 build/trans_presets.java:1976
+#: build/trans_presets.java:1995 build/trans_presets.java:2011
+#: build/trans_presets.java:2028 build/trans_presets.java:2043
+#: build/trans_presets.java:2264 build/trans_presets.java:4025
 msgid "Website"
 msgstr "Webseite"
@@ -29285,14 +30020,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1489 build/trans_presets.java:1541
-#: build/trans_presets.java:1767 build/trans_presets.java:1785
-#: build/trans_presets.java:1801 build/trans_presets.java:1818
-#: build/trans_presets.java:1836 build/trans_presets.java:1853
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1915 build/trans_presets.java:1934
-#: build/trans_presets.java:1951 build/trans_presets.java:1970
-#: build/trans_presets.java:1989 build/trans_presets.java:2005
-#: build/trans_presets.java:2022 build/trans_presets.java:2037
-#: build/trans_presets.java:4019
+#: build/trans_presets.java:1496 build/trans_presets.java:1548
+#: build/trans_presets.java:1774 build/trans_presets.java:1792
+#: build/trans_presets.java:1808 build/trans_presets.java:1825
+#: build/trans_presets.java:1843 build/trans_presets.java:1860
+#: build/trans_presets.java:1882 build/trans_presets.java:1899
+#: build/trans_presets.java:1922 build/trans_presets.java:1941
+#: build/trans_presets.java:1958 build/trans_presets.java:1977
+#: build/trans_presets.java:1996 build/trans_presets.java:2012
+#: build/trans_presets.java:2029 build/trans_presets.java:2044
+#: build/trans_presets.java:4026
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
@@ -29302,6 +30037,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1492 build/trans_presets.java:1531
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1499 build/trans_presets.java:1538
+#: build/trans_presets.java:1566
 msgid "Rental"
 msgstr "Vermietung"
@@ -29310,10 +30045,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1502
 msgid "Edit Car Rental"
 msgstr "Autovermietung bearbeiten"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:1509
 msgid "Sharing"
 msgstr "Autotausch / Car Sharing"
@@ -29321,10 +30056,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1511
 msgid "Edit Car Sharing"
 msgstr "Autotausch (Car Sharing) bearbeiten"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1521
 msgid "Edit Motorcycle Parking"
 msgstr "Motorradparkplatz bearbeiten"
@@ -29332,10 +30067,10 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1517 build/trans_presets.java:1550
+#: build/trans_presets.java:1524 build/trans_presets.java:1557
 msgid "Capacity"
 msgstr "Kapazität"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1528
 msgid "Motorcycle Dealer"
 msgstr "Motorradhändler"
@@ -29343,74 +30078,89 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1530
 msgid "Edit Shop Motorcycle"
 msgstr "Motorradgeschäft bearbeiten"
 
-#: build/trans_presets.java:1526
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
+#: build/trans_presets.java:1533
 msgid "independent"
 msgstr "unabhängig"
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1536
 msgid "Services:"
 msgstr "Dienstleistungen:"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1537
 msgid "Sale"
 msgstr "Verkauf"
 
-#: build/trans_presets.java:1530
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
+#: build/trans_presets.java:1537
 msgctxt "motorcycle"
 msgid "yes"
 msgstr "ja"
 
-#: build/trans_presets.java:1530
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
+#: build/trans_presets.java:1537
 msgctxt "motorcycle"
 msgid "brand"
 msgstr "Marke"
 
-#: build/trans_presets.java:1530
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
+#: build/trans_presets.java:1537
 msgctxt "motorcycle"
 msgid "used"
 msgstr "Gebraucht"
 
-#: build/trans_presets.java:1530
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
+#: build/trans_presets.java:1537
 msgctxt "motorcycle"
 msgid "no"
 msgstr "nein"
 
-#: build/trans_presets.java:1531 build/trans_presets.java:1532
-#: build/trans_presets.java:1534 build/trans_presets.java:1535
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
+#: build/trans_presets.java:1538 build/trans_presets.java:1539
+#: build/trans_presets.java:1541 build/trans_presets.java:1542
 msgid "brand"
 msgstr "Marke"
 
-#: build/trans_presets.java:1532 build/trans_presets.java:1534
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
+#: build/trans_presets.java:1539 build/trans_presets.java:1541
 msgid "oldtimer"
 msgstr "Oldtimer"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1540
 msgid "Safety inspection"
 msgstr "Hauptuntersuchung"
 
-#: build/trans_presets.java:1533
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1540
 msgid "DEKRA"
 msgstr "DEKRA"
 
-#: build/trans_presets.java:1533
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1540
 msgid "GTÜ"
 msgstr "GTÜ"
 
-#: build/trans_presets.java:1533
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1540
 msgid "MOT"
 msgstr "MOT"
 
-#: build/trans_presets.java:1533
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1540
 msgid "TÜV"
 msgstr "TÜV"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1541
 msgid "Parts"
 msgstr "Ersatzteile"
@@ -29420,6 +30170,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1535 build/trans_presets.java:2476
-#: build/trans_presets.java:3259 build/trans_presets.java:3260
+#: build/trans_presets.java:1542 build/trans_presets.java:2483
+#: build/trans_presets.java:3266 build/trans_presets.java:3267
 msgid "Clothes"
 msgstr "Kleidung"
@@ -29427,10 +30177,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1554
 msgid "Edit Bicycle Parking"
 msgstr "Fahrradparkplatz bearbeiten"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1559
 msgid "Bike Dealer"
 msgstr "Fahrradladen"
@@ -29439,5 +30189,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1562
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
@@ -29446,10 +30196,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1569
 msgid "Edit Bicycle Rental"
 msgstr "Fahrradleihstelle bearbeiten"
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1575
 msgctxt "railway"
 msgid "Station"
@@ -29459,5 +30209,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1578
 msgctxt "railway"
 msgid "Edit Station"
@@ -29465,5 +30215,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1583
 msgid "UIC-Reference"
 msgstr "UIC-Referenz"
@@ -29471,5 +30221,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1586
 msgid "Railway Halt"
 msgstr "Eisenbahnhaltepunkt"
@@ -29477,5 +30227,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1588
 msgid "Edit Halt"
 msgstr "Haltepunkt bearbeiten"
@@ -29483,5 +30233,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1595
 msgid "Tram Stop"
 msgstr "Straßenbahnhaltestelle"
@@ -29490,5 +30240,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
 #. item "Public Transport/Tram Stop" label "Edit Tram Stop"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1598
 msgid "Edit Tram Stop"
 msgstr "Straßenbahnhaltestelle bearbeiten"
@@ -29496,5 +30246,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1605
 msgid "Railway Platform"
 msgstr "Bahnsteig"
@@ -29503,5 +30253,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1608
 msgid "Edit Railway Platform"
 msgstr "Bahnsteig bearbeiten"
@@ -29513,5 +30263,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1604 build/trans_presets.java:1649
+#: build/trans_presets.java:1611 build/trans_presets.java:1656
 msgid "Reference (track number)"
 msgstr "Referenznummer (Steig)"
@@ -29519,10 +30269,10 @@
 #. item "Public Transport/Railway Platform" check "Area"
 #. item "Public Transport/Bus Platform" check "Area"
-#: build/trans_presets.java:1606 build/trans_presets.java:1651
+#: build/trans_presets.java:1613 build/trans_presets.java:1658
 msgid "Area"
 msgstr "Fläche"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1615
 msgid "Subway Entrance"
 msgstr "U-Bahn-Eingang"
@@ -29531,5 +30281,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
 #. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1618
 msgid "Edit Subway Entrance"
 msgstr "U-Bahn-Eingang bearbeiten"
@@ -29537,5 +30287,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1616 build/trans_presets.java:2433
+#: build/trans_presets.java:1623 build/trans_presets.java:2440
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -29544,5 +30294,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1628
 msgid "Bus Station"
 msgstr "Busbahnhof"
@@ -29551,5 +30301,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
 #. item "Public Transport/Bus Station" label "Edit Bus Station"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1631
 msgid "Edit Bus Station"
 msgstr "Busbahnhof bearbeiten"
@@ -29557,5 +30307,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1637
 msgid "Bus Stop"
 msgstr "Bushaltestelle"
@@ -29565,5 +30315,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
 #. item "Public Transport/Bus Stop" label "Edit Bus Stop"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1641
 msgid "Edit Bus Stop"
 msgstr "Bushaltestelle bearbeiten"
@@ -29572,6 +30322,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1639 build/trans_presets.java:2495
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:1646 build/trans_presets.java:2502
+#: build/trans_presets.java:2512
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -29581,10 +30331,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1640 build/trans_presets.java:2487
+#: build/trans_presets.java:1647 build/trans_presets.java:2494
 msgid "Bench"
 msgstr "Sitzbank"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1648
 msgid "Tactile Paving"
 msgstr "Blindenleitbelag"
@@ -29592,10 +30342,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1652
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1653
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -29603,10 +30353,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1661
 msgid "Ticket Machine"
 msgstr "Fahrausweisautomat"
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1667
 msgid "Reference Number"
 msgstr "Referenznummer"
@@ -29615,6 +30365,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1661 build/trans_presets.java:2447
-#: build/trans_presets.java:3584
+#: build/trans_presets.java:1668 build/trans_presets.java:2454
+#: build/trans_presets.java:3591
 msgid "Coins"
 msgstr "Münzen"
@@ -29623,6 +30373,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1662 build/trans_presets.java:2448
-#: build/trans_presets.java:3585
+#: build/trans_presets.java:1669 build/trans_presets.java:2455
+#: build/trans_presets.java:3592
 msgid "Notes"
 msgstr "Scheine"
@@ -29631,6 +30381,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1663 build/trans_presets.java:2449
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:1670 build/trans_presets.java:2456
+#: build/trans_presets.java:3593
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -29639,6 +30389,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1664 build/trans_presets.java:2450
-#: build/trans_presets.java:3587
+#: build/trans_presets.java:1671 build/trans_presets.java:2457
+#: build/trans_presets.java:3594
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -29647,6 +30397,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1665 build/trans_presets.java:2451
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:1672 build/trans_presets.java:2458
+#: build/trans_presets.java:3595
 msgid "Credit cards"
 msgstr "Kreditkarten"
@@ -29654,10 +30404,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1666 build/trans_presets.java:3589
+#: build/trans_presets.java:1673 build/trans_presets.java:3596
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Taxi"
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1676
 msgid "Taxi"
 msgstr "Taxi"
@@ -29665,5 +30415,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1678
 msgid "Edit Taxi station"
 msgstr "Taxihaltepunkt bearbeiten"
@@ -29671,10 +30421,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1683
 msgid "Airport"
 msgstr "Flughafen"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1684
 msgid "Airport Ground"
 msgstr "Flugplatz"
@@ -29682,5 +30432,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1686
 msgid "Edit Airport Ground"
 msgstr "Flugplatz bearbeiten"
@@ -29688,10 +30438,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1690
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1691
 msgid "ICAO"
 msgstr "ICAO"
@@ -29700,5 +30450,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1696
 msgid "Runway"
 msgstr "Start-/Landebahn"
@@ -29706,5 +30456,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1698
 msgid "Edit Runway"
 msgstr "Start-/Landebahn bearbeiten"
@@ -29712,5 +30462,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1704
 msgid "Taxiway"
 msgstr "Rollbahn"
@@ -29718,5 +30468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1706
 msgid "Edit Taxiway"
 msgstr "Rollbahn bearbeiten"
@@ -29724,5 +30474,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1712
 msgid "Helipad"
 msgstr "Hubschrauberlandeplatz"
@@ -29730,5 +30480,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1714
 msgid "Edit Helipad"
 msgstr "Hubschrauberlandeplatz bearbeiten"
@@ -29738,5 +30488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1713 build/trans_presets.java:1715
+#: build/trans_presets.java:1720 build/trans_presets.java:1722
 msgid "Apron"
 msgstr "Vorfeld"
@@ -29746,5 +30496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1718 build/trans_presets.java:1720
+#: build/trans_presets.java:1725 build/trans_presets.java:1727
 msgid "Hangar"
 msgstr "Hangar"
@@ -29755,6 +30505,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1723 build/trans_presets.java:1725
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:1730 build/trans_presets.java:1732
+#: build/trans_presets.java:2997
 msgid "Beacon"
 msgstr "Bake"
@@ -29764,5 +30514,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1728 build/trans_presets.java:1730
+#: build/trans_presets.java:1735 build/trans_presets.java:1737
 msgid "Windsock"
 msgstr "Windsack"
@@ -29771,5 +30521,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1741
 msgid "Terminal"
 msgstr "Terminal"
@@ -29777,10 +30527,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1743
 msgid "Edit Terminal"
 msgstr "Terminal bearbeiten"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1747
 msgctxt "airport"
 msgid "Gate"
@@ -29789,15 +30539,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1749
 msgid "Edit Terminal Gate"
 msgstr "Flugsteig/Gate bearbeiten"
 
 #. group "Facilities"
-#: build/trans_presets.java:1748 build/trans_presets.java:2425
+#: build/trans_presets.java:1755 build/trans_presets.java:2432
 msgid "Facilities"
 msgstr "Einrichtungen"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1756
 msgid "Accommodation"
 msgstr "Unterkunft"
@@ -29809,5 +30559,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1750 build/trans_surveyor.java:43
+#: build/trans_presets.java:1757 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -29816,5 +30566,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1760
 msgid "Edit Hotel"
 msgstr "Hotel bearbeiten"
@@ -29828,8 +30578,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1757 build/trans_presets.java:1775
-#: build/trans_presets.java:1791 build/trans_presets.java:1808
-#: build/trans_presets.java:1826 build/trans_presets.java:1860
-#: build/trans_presets.java:1882 build/trans_presets.java:1905
+#: build/trans_presets.java:1764 build/trans_presets.java:1782
+#: build/trans_presets.java:1798 build/trans_presets.java:1815
+#: build/trans_presets.java:1833 build/trans_presets.java:1867
+#: build/trans_presets.java:1889 build/trans_presets.java:1912
 msgid "Stars"
 msgstr "Sterne"
@@ -29865,37 +30615,82 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1759 build/trans_presets.java:1777
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1884
-#: build/trans_presets.java:1907 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1962
-#: build/trans_presets.java:1981 build/trans_presets.java:1997
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:1766 build/trans_presets.java:1784
+#: build/trans_presets.java:1800 build/trans_presets.java:1817
+#: build/trans_presets.java:1835 build/trans_presets.java:1852
+#: build/trans_presets.java:1869 build/trans_presets.java:1891
+#: build/trans_presets.java:1914 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1969
+#: build/trans_presets.java:1988 build/trans_presets.java:2004
+#: build/trans_presets.java:2021
 msgid "Internet access"
 msgstr "Internetzugang"
 
-#: build/trans_presets.java:1759 build/trans_presets.java:1777
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1884
-#: build/trans_presets.java:1907 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1962
-#: build/trans_presets.java:1981 build/trans_presets.java:1997
-#: build/trans_presets.java:2014
+#. item "Facilities/Accommodation/Hotel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Motel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Guest House" combo "Internet access" display value
+#. item "Facilities/Accommodation/Chalet" combo "Internet access" display value
+#. item "Facilities/Accommodation/Hostel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access" display value
+#. item "Food+Drinks/Restaurant" combo "Internet access" display value
+#. item "Food+Drinks/Fast Food" combo "Internet access" display value
+#. item "Food+Drinks/Food Court" combo "Internet access" display value
+#. item "Food+Drinks/Cafe" combo "Internet access" display value
+#. item "Food+Drinks/Pub" combo "Internet access" display value
+#. item "Food+Drinks/Biergarten" combo "Internet access" display value
+#. item "Food+Drinks/Bar" combo "Internet access" display value
+#: build/trans_presets.java:1766 build/trans_presets.java:1784
+#: build/trans_presets.java:1800 build/trans_presets.java:1817
+#: build/trans_presets.java:1835 build/trans_presets.java:1852
+#: build/trans_presets.java:1869 build/trans_presets.java:1891
+#: build/trans_presets.java:1914 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1969
+#: build/trans_presets.java:1988 build/trans_presets.java:2004
+#: build/trans_presets.java:2021
 msgid "wlan"
 msgstr "WLAN"
 
-#: build/trans_presets.java:1759 build/trans_presets.java:1777
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1884
-#: build/trans_presets.java:1907 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1962
-#: build/trans_presets.java:1981 build/trans_presets.java:1997
-#: build/trans_presets.java:2014
+#. item "Facilities/Accommodation/Hotel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Motel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Guest House" combo "Internet access" display value
+#. item "Facilities/Accommodation/Chalet" combo "Internet access" display value
+#. item "Facilities/Accommodation/Hostel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access" display value
+#. item "Food+Drinks/Restaurant" combo "Internet access" display value
+#. item "Food+Drinks/Fast Food" combo "Internet access" display value
+#. item "Food+Drinks/Food Court" combo "Internet access" display value
+#. item "Food+Drinks/Cafe" combo "Internet access" display value
+#. item "Food+Drinks/Pub" combo "Internet access" display value
+#. item "Food+Drinks/Biergarten" combo "Internet access" display value
+#. item "Food+Drinks/Bar" combo "Internet access" display value
+#: build/trans_presets.java:1766 build/trans_presets.java:1784
+#: build/trans_presets.java:1800 build/trans_presets.java:1817
+#: build/trans_presets.java:1835 build/trans_presets.java:1852
+#: build/trans_presets.java:1869 build/trans_presets.java:1891
+#: build/trans_presets.java:1914 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1969
+#: build/trans_presets.java:1988 build/trans_presets.java:2004
+#: build/trans_presets.java:2021
 msgid "wired"
 msgstr "Kabel"
 
+#. item "Facilities/Accommodation/Hotel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Motel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Guest House" combo "Internet access" display value
+#. item "Facilities/Accommodation/Chalet" combo "Internet access" display value
+#. item "Facilities/Accommodation/Hostel" combo "Internet access" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Internet access" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Internet access" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Internet access" display value
+#. item "Food+Drinks/Restaurant" combo "Internet access" display value
+#. item "Food+Drinks/Fast Food" combo "Internet access" display value
+#. item "Food+Drinks/Food Court" combo "Internet access" display value
+#. item "Food+Drinks/Cafe" combo "Internet access" display value
+#. item "Food+Drinks/Pub" combo "Internet access" display value
+#. item "Food+Drinks/Biergarten" combo "Internet access" display value
+#. item "Food+Drinks/Bar" combo "Internet access" display value
 #. <icon annotate="true" src="transport/airport.png"/>
 #. </rule>
@@ -29904,12 +30699,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1759 build/trans_presets.java:1777
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1884
-#: build/trans_presets.java:1907 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1962
-#: build/trans_presets.java:1981 build/trans_presets.java:1997
-#: build/trans_presets.java:2014 build/trans_style.java:1064
+#: build/trans_presets.java:1766 build/trans_presets.java:1784
+#: build/trans_presets.java:1800 build/trans_presets.java:1817
+#: build/trans_presets.java:1835 build/trans_presets.java:1852
+#: build/trans_presets.java:1869 build/trans_presets.java:1891
+#: build/trans_presets.java:1914 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1969
+#: build/trans_presets.java:1988 build/trans_presets.java:2004
+#: build/trans_presets.java:2021 build/trans_style.java:1064
 msgid "terminal"
 msgstr "Terminal"
@@ -29930,12 +30725,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1760 build/trans_presets.java:1778
-#: build/trans_presets.java:1794 build/trans_presets.java:1811
-#: build/trans_presets.java:1829 build/trans_presets.java:1846
-#: build/trans_presets.java:1863 build/trans_presets.java:1885
-#: build/trans_presets.java:1908 build/trans_presets.java:1927
-#: build/trans_presets.java:1944 build/trans_presets.java:1963
-#: build/trans_presets.java:1982 build/trans_presets.java:1998
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:1767 build/trans_presets.java:1785
+#: build/trans_presets.java:1801 build/trans_presets.java:1818
+#: build/trans_presets.java:1836 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1892
+#: build/trans_presets.java:1915 build/trans_presets.java:1934
+#: build/trans_presets.java:1951 build/trans_presets.java:1970
+#: build/trans_presets.java:1989 build/trans_presets.java:2005
+#: build/trans_presets.java:2022
 msgid "Internet access fee"
 msgstr "Internetgebühr"
@@ -29958,50 +30753,98 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1761 build/trans_presets.java:1779
-#: build/trans_presets.java:1795 build/trans_presets.java:1812
-#: build/trans_presets.java:1830 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1886
-#: build/trans_presets.java:1909 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1964
-#: build/trans_presets.java:1983 build/trans_presets.java:1999
-#: build/trans_presets.java:2016 build/trans_presets.java:2031
+#: build/trans_presets.java:1768 build/trans_presets.java:1786
+#: build/trans_presets.java:1802 build/trans_presets.java:1819
+#: build/trans_presets.java:1837 build/trans_presets.java:1854
+#: build/trans_presets.java:1871 build/trans_presets.java:1893
+#: build/trans_presets.java:1916 build/trans_presets.java:1935
+#: build/trans_presets.java:1952 build/trans_presets.java:1971
+#: build/trans_presets.java:1990 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2038
 msgid "Smoking"
 msgstr "Rauchen"
 
-#: build/trans_presets.java:1761 build/trans_presets.java:1779
-#: build/trans_presets.java:1795 build/trans_presets.java:1812
-#: build/trans_presets.java:1830 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1886
-#: build/trans_presets.java:1909 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1964
-#: build/trans_presets.java:1983 build/trans_presets.java:1999
-#: build/trans_presets.java:2016 build/trans_presets.java:2031
+#. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Motel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Guest House" combo "Smoking" display value
+#. item "Facilities/Accommodation/Chalet" combo "Smoking" display value
+#. item "Facilities/Accommodation/Hostel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Smoking" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Smoking" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Smoking" display value
+#. item "Food+Drinks/Restaurant" combo "Smoking" display value
+#. item "Food+Drinks/Fast Food" combo "Smoking" display value
+#. item "Food+Drinks/Food Court" combo "Smoking" display value
+#. item "Food+Drinks/Cafe" combo "Smoking" display value
+#. item "Food+Drinks/Pub" combo "Smoking" display value
+#. item "Food+Drinks/Biergarten" combo "Smoking" display value
+#. item "Food+Drinks/Bar" combo "Smoking" display value
+#. item "Food+Drinks/Nightclub" combo "Smoking" display value
+#: build/trans_presets.java:1768 build/trans_presets.java:1786
+#: build/trans_presets.java:1802 build/trans_presets.java:1819
+#: build/trans_presets.java:1837 build/trans_presets.java:1854
+#: build/trans_presets.java:1871 build/trans_presets.java:1893
+#: build/trans_presets.java:1916 build/trans_presets.java:1935
+#: build/trans_presets.java:1952 build/trans_presets.java:1971
+#: build/trans_presets.java:1990 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2038
 msgid "dedicated"
 msgstr "gewidmet"
 
-#: build/trans_presets.java:1761 build/trans_presets.java:1779
-#: build/trans_presets.java:1795 build/trans_presets.java:1812
-#: build/trans_presets.java:1830 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1886
-#: build/trans_presets.java:1909 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1964
-#: build/trans_presets.java:1983 build/trans_presets.java:1999
-#: build/trans_presets.java:2016 build/trans_presets.java:2031
+#. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Motel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Guest House" combo "Smoking" display value
+#. item "Facilities/Accommodation/Chalet" combo "Smoking" display value
+#. item "Facilities/Accommodation/Hostel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Smoking" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Smoking" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Smoking" display value
+#. item "Food+Drinks/Restaurant" combo "Smoking" display value
+#. item "Food+Drinks/Fast Food" combo "Smoking" display value
+#. item "Food+Drinks/Food Court" combo "Smoking" display value
+#. item "Food+Drinks/Cafe" combo "Smoking" display value
+#. item "Food+Drinks/Pub" combo "Smoking" display value
+#. item "Food+Drinks/Biergarten" combo "Smoking" display value
+#. item "Food+Drinks/Bar" combo "Smoking" display value
+#. item "Food+Drinks/Nightclub" combo "Smoking" display value
+#: build/trans_presets.java:1768 build/trans_presets.java:1786
+#: build/trans_presets.java:1802 build/trans_presets.java:1819
+#: build/trans_presets.java:1837 build/trans_presets.java:1854
+#: build/trans_presets.java:1871 build/trans_presets.java:1893
+#: build/trans_presets.java:1916 build/trans_presets.java:1935
+#: build/trans_presets.java:1952 build/trans_presets.java:1971
+#: build/trans_presets.java:1990 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2038
 msgid "separated"
 msgstr "separat"
 
-#: build/trans_presets.java:1761 build/trans_presets.java:1779
-#: build/trans_presets.java:1795 build/trans_presets.java:1812
-#: build/trans_presets.java:1830 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1886
-#: build/trans_presets.java:1909 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1964
-#: build/trans_presets.java:1983 build/trans_presets.java:1999
-#: build/trans_presets.java:2016 build/trans_presets.java:2031
+#. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Motel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Guest House" combo "Smoking" display value
+#. item "Facilities/Accommodation/Chalet" combo "Smoking" display value
+#. item "Facilities/Accommodation/Hostel" combo "Smoking" display value
+#. item "Facilities/Accommodation/Alpine Hut" combo "Smoking" display value
+#. item "Facilities/Accommodation/Caravan Site" combo "Smoking" display value
+#. item "Facilities/Accommodation/Camping Site" combo "Smoking" display value
+#. item "Food+Drinks/Restaurant" combo "Smoking" display value
+#. item "Food+Drinks/Fast Food" combo "Smoking" display value
+#. item "Food+Drinks/Food Court" combo "Smoking" display value
+#. item "Food+Drinks/Cafe" combo "Smoking" display value
+#. item "Food+Drinks/Pub" combo "Smoking" display value
+#. item "Food+Drinks/Biergarten" combo "Smoking" display value
+#. item "Food+Drinks/Bar" combo "Smoking" display value
+#. item "Food+Drinks/Nightclub" combo "Smoking" display value
+#: build/trans_presets.java:1768 build/trans_presets.java:1786
+#: build/trans_presets.java:1802 build/trans_presets.java:1819
+#: build/trans_presets.java:1837 build/trans_presets.java:1854
+#: build/trans_presets.java:1871 build/trans_presets.java:1893
+#: build/trans_presets.java:1916 build/trans_presets.java:1935
+#: build/trans_presets.java:1952 build/trans_presets.java:1971
+#: build/trans_presets.java:1990 build/trans_presets.java:2006
+#: build/trans_presets.java:2023 build/trans_presets.java:2038
 msgid "isolated"
 msgstr "isoliert"
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1776
 msgid "Motel"
 msgstr "Motel"
@@ -30009,20 +30852,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1778
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1794
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1795
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1810
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -30030,10 +30873,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1812
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1827
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -30041,15 +30884,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1829
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1845
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1846
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
@@ -30057,10 +30900,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1863
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1864
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
@@ -30068,29 +30911,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1874
 msgid "Number of places"
 msgstr "Anzahl Plätze"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1875
 msgid "Requires a fee"
 msgstr "Gebührenpflichtig"
 
-#: build/trans_presets.java:1868
+#. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
+#: build/trans_presets.java:1875
 msgid "interval"
 msgstr "Intervall"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1876
 msgid "Power supply"
 msgstr "Stromversorgung"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1877
 msgid "Tents allowed"
 msgstr "Zelte erlaubt"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1884
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -30098,10 +30942,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1886
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1902
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -30112,5 +30956,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:1896 build/trans_surveyor.java:47
+#: build/trans_presets.java:1903 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -30118,5 +30962,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1905
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
@@ -30125,74 +30969,108 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
+#: build/trans_presets.java:1966
 msgid "Cuisine"
 msgstr "Küche"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "french"
 msgstr "französisch"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "sandwich"
 msgstr "Sandwich"
 
-#: build/trans_presets.java:1902 build/trans_presets.java:1923
+#. item "Food+Drinks/Restaurant" combo "Cuisine" display value
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1909 build/trans_presets.java:1930
 msgid "sushi"
 msgstr "Sushi"
@@ -30200,10 +31078,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1903 build/trans_presets.java:1978
+#: build/trans_presets.java:1910 build/trans_presets.java:1985
 msgid "Microbrewery"
 msgstr "Kleinbrauerei"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1924
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -30211,18 +31089,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1926
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1923
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1930
 msgid "fish_and_chips"
 msgstr "Fish and Chips"
 
-#: build/trans_presets.java:1923
+#. item "Food+Drinks/Fast Food" combo "Cuisine" display value
+#: build/trans_presets.java:1930
 msgid "chicken"
 msgstr "Hähnchen"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1943
 msgid "Food Court"
 msgstr "Food Court"
@@ -30230,10 +31110,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1945
 msgid "Edit Food Court"
 msgstr "Food Court bearbeiten"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1960
 msgid "Cafe"
 msgstr "Café"
@@ -30241,14 +31121,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1962
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
-#: build/trans_presets.java:1959
+#. item "Food+Drinks/Cafe" combo "Cuisine" display value
+#: build/trans_presets.java:1966
 msgid "ice_cream"
 msgstr "Speiseeis"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1979
 msgid "Pub"
 msgstr "Kneipe"
@@ -30256,20 +31137,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1981
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:1998
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1999
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2014
 msgid "Bar"
 msgstr "Bar"
@@ -30277,10 +31158,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2016
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2031
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -30288,25 +31169,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2033
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
 #. group "Tourism"
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2047
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2048
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2049
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2054
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -30314,10 +31195,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2056
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2059
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
@@ -30325,22 +31206,24 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2062
 msgid "Information Office"
 msgstr "Informationsbüro"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2069
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2074
 msgid "Detail Grade"
 msgstr "Detailgrad"
 
-#: build/trans_presets.java:2067
+#. item "Tourism/Map" combo "Detail Grade" display value
+#: build/trans_presets.java:2074
 msgid "topo"
 msgstr "topographisch"
 
+#. item "Tourism/Map" combo "Detail Grade" display value
 #. <roles>
 #. item "Relations/Associated street" role "street"
@@ -30369,5 +31252,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2067 build/trans_presets.java:4118
+#: build/trans_presets.java:2074 build/trans_presets.java:4125
 #: build/trans_style.java:472 build/trans_style.java:484
 #: build/trans_style.java:496 build/trans_style.java:502
@@ -30375,22 +31258,26 @@
 msgstr "Straße"
 
-#: build/trans_presets.java:2067
+#. item "Tourism/Map" combo "Detail Grade" display value
+#: build/trans_presets.java:2074
 msgid "scheme"
 msgstr "schematisch"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2075
 msgid "Shown Area"
 msgstr "Kartenausschnitt"
 
-#: build/trans_presets.java:2068
+#. item "Tourism/Map" combo "Shown Area" display value
+#: build/trans_presets.java:2075
 msgid "site"
 msgstr "Örtlichkeit"
 
-#: build/trans_presets.java:2068
+#. item "Tourism/Map" combo "Shown Area" display value
+#: build/trans_presets.java:2075
 msgid "city"
 msgstr "Stadt"
 
-#: build/trans_presets.java:2068
+#. item "Tourism/Map" combo "Shown Area" display value
+#: build/trans_presets.java:2075
 msgid "region"
 msgstr "Region"
@@ -30399,6 +31286,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2069 build/trans_presets.java:2085
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2076 build/trans_presets.java:2092
+#: build/trans_presets.java:2137
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
@@ -30408,5 +31295,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2071 build/trans_presets.java:2094
+#: build/trans_presets.java:2078 build/trans_presets.java:2101
 msgid "Routes shown for:"
 msgstr "Dargestellte Routen für:"
@@ -30414,5 +31301,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2072 build/trans_presets.java:2095
+#: build/trans_presets.java:2079 build/trans_presets.java:2102
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -30421,6 +31308,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2073 build/trans_presets.java:2096
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2080 build/trans_presets.java:2103
+#: build/trans_presets.java:2620
 msgid "Cycling"
 msgstr "Radfahren"
@@ -30428,5 +31315,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2074 build/trans_presets.java:2097
+#: build/trans_presets.java:2081 build/trans_presets.java:2104
 msgid "Mountainbiking"
 msgstr "Mountainbike fahren"
@@ -30435,6 +31322,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2075 build/trans_presets.java:2098
-#: build/trans_presets.java:2099 build/trans_presets.java:2661
+#: build/trans_presets.java:2082 build/trans_presets.java:2105
+#: build/trans_presets.java:2106 build/trans_presets.java:2668
 msgid "Skiing"
 msgstr "Skifahren"
@@ -30442,5 +31329,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2076 build/trans_presets.java:2100
+#: build/trans_presets.java:2083 build/trans_presets.java:2107
 msgid "Riding"
 msgstr "Reiten"
@@ -30448,45 +31335,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2077 build/trans_presets.java:2101
+#: build/trans_presets.java:2084 build/trans_presets.java:2108
 msgid "... other transportation modes possible"
 msgstr "...andere mögliche Transportarten"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2086
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2091
 msgid "Board Content"
 msgstr "Inhalt"
 
-#: build/trans_presets.java:2084
+#. item "Tourism/Information Board" combo "Board Content" display value
+#: build/trans_presets.java:2091
 msgid "notice"
 msgstr "Notiz"
 
-#: build/trans_presets.java:2084
+#. item "Tourism/Information Board" combo "Board Content" display value
+#: build/trans_presets.java:2091
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:2084
+#. item "Tourism/Information Board" combo "Board Content" display value
+#: build/trans_presets.java:2091
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:2084
+#. item "Tourism/Information Board" combo "Board Content" display value
+#: build/trans_presets.java:2091
 msgid "wildlife"
 msgstr "Wildtiere"
 
-#: build/trans_presets.java:2084
+#. item "Tourism/Information Board" combo "Board Content" display value
+#: build/trans_presets.java:2091
 msgid "plants"
 msgstr "Pflanzen"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2094
 msgid "Guidepost"
 msgstr "Wegweiser"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2110
 msgid "Information Terminal"
 msgstr "Informationsterminal"
@@ -30494,10 +31386,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2108 build/trans_presets.java:2118
+#: build/trans_presets.java:2115 build/trans_presets.java:2125
 msgid "Closer description"
 msgstr "Nähere Beschreibung"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2120
 msgid "Audioguide"
 msgstr "Audioguide"
@@ -30505,25 +31397,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2130
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide per Handy?"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2131
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2133
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. group "Leisure"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2140
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2141
 msgid "Cinema"
 msgstr "Kino"
@@ -30532,10 +31424,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2144
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2148
 msgid "Zoo"
 msgstr "Zoo"
@@ -30544,30 +31436,30 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2151
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2150
+#: build/trans_presets.java:2157
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2158
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2163
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2164
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2168
 msgid "Sauna"
 msgstr "Sauna"
@@ -30577,19 +31469,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2162 build/trans_presets.java:2165
+#: build/trans_presets.java:2169 build/trans_presets.java:2172
 msgid "Edit Sauna"
 msgstr "Sauna bearbeiten"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2280
-#: build/trans_presets.java:2388 build/trans_presets.java:3201
-#: build/trans_presets.java:3210 build/trans_presets.java:3227
-#: build/trans_presets.java:3236 build/trans_presets.java:3273
-#: build/trans_presets.java:3322 build/trans_presets.java:3345
-#: build/trans_presets.java:3354 build/trans_presets.java:3401
-#: build/trans_presets.java:3410 build/trans_presets.java:3438
-#: build/trans_presets.java:3447 build/trans_presets.java:3486
-#: build/trans_presets.java:3502 build/trans_presets.java:3511
-#: build/trans_presets.java:3520 build/trans_presets.java:3536
-#: build/trans_presets.java:3558 build/trans_presets.java:3573
+#. item "Leisure/Sauna" combo "Opening Hours" display value
+#. item "Public Building/Community Centre" combo "Opening Hours" display value
+#. item "Health/Hearing Aids" combo "Opening Hours" display value
+#. item "Shops/Food/Seafood" combo "Opening Hours" display value
+#. item "Shops/Food/Deli (Fine Food)" combo "Opening Hours" display value
+#. item "Shops/Food/Marketplace" combo "Opening Hours" display value
+#. item "Shops/Food/Greengrocer" combo "Opening Hours" display value
+#. item "Clothes/Boutique" combo "Opening Hours" display value
+#. item "Clothes/Fabric" combo "Opening Hours" display value
+#. item "Electronic/Mobile Phone" combo "Opening Hours" display value
+#. item "Electronic/Vacuum Cleaner" combo "Opening Hours" display value
+#. item "Other/Department Store" combo "Opening Hours" display value
+#. item "Other/Mall" combo "Opening Hours" display value
+#. item "Other/Jewelry" combo "Opening Hours" display value
+#. item "Other/Erotic" combo "Opening Hours" display value
+#. item "Other/Paint" combo "Opening Hours" display value
+#. item "Other/Kitchen" combo "Opening Hours" display value
+#. item "Other/Curtain" combo "Opening Hours" display value
+#. item "Other/Frame" combo "Opening Hours" display value
+#. item "Other/Copyshop" combo "Opening Hours" display value
+#. item "Other/Musical Instrument" combo "Opening Hours" display value
+#. item "Other/Variety Store" combo "Opening Hours" display value
+#: build/trans_presets.java:2177 build/trans_presets.java:2287
+#: build/trans_presets.java:2395 build/trans_presets.java:3208
+#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3243 build/trans_presets.java:3280
+#: build/trans_presets.java:3329 build/trans_presets.java:3352
+#: build/trans_presets.java:3361 build/trans_presets.java:3408
+#: build/trans_presets.java:3417 build/trans_presets.java:3445
+#: build/trans_presets.java:3454 build/trans_presets.java:3493
+#: build/trans_presets.java:3509 build/trans_presets.java:3518
+#: build/trans_presets.java:3527 build/trans_presets.java:3543
+#: build/trans_presets.java:3565 build/trans_presets.java:3580
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
@@ -30597,5 +31511,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2181
 msgid "Playground"
 msgstr "Spielplatz"
@@ -30603,15 +31517,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2183
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2187
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2188
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
@@ -30619,10 +31533,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2184 build/trans_presets.java:2499
+#: build/trans_presets.java:2191 build/trans_presets.java:2506
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2193
 msgid "Public Grill"
 msgstr "Grillplatz"
@@ -30630,44 +31544,46 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2195
 msgid "Edit Public Grill"
 msgstr "Grillplatz bearbeiten"
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2199
 msgid "Covered"
 msgstr "Überdachung"
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2200
 msgctxt "grill"
 msgid "Fuel"
 msgstr "Heizmaterial"
 
-#: build/trans_presets.java:2193
+#. item "Leisure/Public Grill" combo "Fuel" display value
+#: build/trans_presets.java:2200
 msgid "charcoal"
 msgstr "Holzkohle"
 
-#: build/trans_presets.java:2193
+#. item "Leisure/Public Grill" combo "Fuel" display value
+#: build/trans_presets.java:2200
 msgid "electric"
 msgstr "Elektrisch"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2202
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2203
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. group "Culture"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2208
 msgid "Culture"
 msgstr "Kultur"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2209
 msgid "Museum"
 msgstr "Museum"
@@ -30675,10 +31591,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2211
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2217
 msgid "Theatre"
 msgstr "Theater"
@@ -30687,10 +31603,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2220
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2224
 msgid "Library"
 msgstr "Bibliothek"
@@ -30699,10 +31615,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2227
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2232
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -30710,10 +31626,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2234
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2238
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -30721,10 +31637,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2240
 msgid "Edit Artwork"
 msgstr "Kunstausstellung bearbeiten"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2244
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -30734,5 +31650,5 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Culture/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2248
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -30741,66 +31657,102 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "Religion"
 msgstr "Religion"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2244 build/trans_presets.java:3906
-#: build/trans_presets.java:3915
+#. item "Culture/Place of Worship" combo "Religion" display value
+#. item "Land use/Graveyard" combo "Religion" display value
+#. item "Land use/Cemetery" combo "Religion" display value
+#: build/trans_presets.java:2251 build/trans_presets.java:3913
+#: build/trans_presets.java:3922
 msgid "zoroastrian"
 msgstr "zoroastrisch"
@@ -30809,86 +31761,131 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "Denomination"
 msgstr "Konfession"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2245 build/trans_presets.java:3907
-#: build/trans_presets.java:3916
+#. item "Culture/Place of Worship" combo "Denomination" display value
+#. item "Land use/Graveyard" combo "Denomination" display value
+#. item "Land use/Cemetery" combo "Denomination" display value
+#: build/trans_presets.java:2252 build/trans_presets.java:3914
+#: build/trans_presets.java:3923
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2255
 msgid "Recording Studio"
 msgstr "Aufnahmestudio"
@@ -30896,13 +31893,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2257
 msgid "Edit Studio"
 msgstr "Studio bearbeiten"
 
-#: build/trans_presets.java:2255
+#. item "Culture/Recording Studio" combo "Type" display value
+#: build/trans_presets.java:2262
 msgid "audio"
 msgstr "Audio"
 
-#: build/trans_presets.java:2255
+#. item "Culture/Recording Studio" combo "Type" display value
+#: build/trans_presets.java:2262
 msgid "video"
 msgstr "Video"
@@ -30910,5 +31909,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2260 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2268
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -30916,10 +31915,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2270
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäude bearbeiten"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2274
 msgid "Town hall"
 msgstr "Rathaus"
@@ -30927,5 +31926,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2276
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
@@ -30934,10 +31933,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2273 build/trans_presets.java:2275
+#: build/trans_presets.java:2280 build/trans_presets.java:2282
 msgid "Community Centre"
 msgstr "Stadthalle/Bürgerhaus"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2289
 msgid "Embassy"
 msgstr "Botschaft"
@@ -30945,10 +31944,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2291
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2288
+#: build/trans_presets.java:2295
 msgid "Courthouse"
 msgstr "Gericht"
@@ -30957,10 +31956,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2298
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2302
 msgid "Prison"
 msgstr "Gefängnis"
@@ -30969,10 +31968,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2305
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2309
 msgid "Police"
 msgstr "Polizei"
@@ -30982,10 +31981,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2313
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2317
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -30994,10 +31993,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2320
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2324
 msgid "Post Office"
 msgstr "Post"
@@ -31005,25 +32004,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2326
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
 
 #. group "Education"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2332
 msgid "Education"
 msgstr "Bildung"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2333
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2334
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Education/School"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2338
 msgid "School"
 msgstr "Schule"
@@ -31031,10 +32030,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2340
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Education/University"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2344
 msgid "University"
 msgstr "Universität"
@@ -31042,10 +32041,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2346
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Education/College"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2350
 msgid "College"
 msgstr "Hochschule"
@@ -31053,10 +32052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2352
 msgid "Edit College"
 msgstr "College bearbeiten"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2356
 msgid "Driving School"
 msgstr "Fahrschule"
@@ -31064,20 +32063,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2358
 msgid "Edit Driving School"
 msgstr "Fahrschule bearbeiten"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2363
 msgid "License Classes"
 msgstr "Führerscheinklassen"
 
 #. group "Health"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2366
 msgid "Health"
 msgstr "Gesundheit"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2367
 msgid "Doctors"
 msgstr "Arzt"
@@ -31085,20 +32084,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2369
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2374
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2375
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2380
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -31106,5 +32105,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2382
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -31112,10 +32111,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2384
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2388
 msgid "Hearing Aids"
 msgstr "Hörgeräte"
@@ -31123,10 +32122,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2390
 msgid "Edit Hearing Aids"
 msgstr "Hörgeräte bearbeiten"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2397
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -31134,10 +32133,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2399
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2403
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -31145,10 +32144,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2405
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2403
+#: build/trans_presets.java:2410
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -31157,5 +32156,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2413
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -31164,15 +32163,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2416
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2417
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2420
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -31180,5 +32179,5 @@
 #. <space />
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2423
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -31187,14 +32186,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2426
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2433
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2433
+#. item "Facilities/Toilets" combo "Wheelchair" display value
+#: build/trans_presets.java:2440
 msgid "limited"
 msgstr "limitiert"
@@ -31202,15 +32202,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2434 build/trans_presets.java:3583
+#: build/trans_presets.java:2441 build/trans_presets.java:3590
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2443
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2448
 msgid "Telephone"
 msgstr "Telefon"
@@ -31219,15 +32219,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2451
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2459
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2461
 msgid "Clock"
 msgstr "Uhr"
@@ -31236,5 +32236,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2464
 msgid "Edit Clock"
 msgstr "Uhr anpassen"
@@ -31244,75 +32244,87 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2460 build/trans_presets.java:3012
+#: build/trans_presets.java:2467 build/trans_presets.java:3019
 msgid "Display"
 msgstr "Anzeige"
 
-#: build/trans_presets.java:2460 build/trans_presets.java:3012
+#. item "Facilities/Clock" combo "Display" display value
+#. item "Man Made/Man Made/Measurement Station" combo "Display" display value
+#: build/trans_presets.java:2467 build/trans_presets.java:3019
 msgid "analog"
 msgstr "Analog"
 
-#: build/trans_presets.java:2460 build/trans_presets.java:3012
+#. item "Facilities/Clock" combo "Display" display value
+#. item "Man Made/Man Made/Measurement Station" combo "Display" display value
+#: build/trans_presets.java:2467 build/trans_presets.java:3019
 msgid "digital"
 msgstr "Digital"
 
-#: build/trans_presets.java:2460
+#. item "Facilities/Clock" combo "Display" display value
+#: build/trans_presets.java:2467
 msgid "sundial"
 msgstr "Sonnenuhr"
 
-#: build/trans_presets.java:2460
+#. item "Facilities/Clock" combo "Display" display value
+#: build/trans_presets.java:2467
 msgid "unorthodox"
 msgstr "Unkonventionell"
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2468
 msgid "Support"
 msgstr "Anbringung"
 
-#: build/trans_presets.java:2461
+#. item "Facilities/Clock" combo "Support" display value
+#: build/trans_presets.java:2468
 msgid "pole"
 msgstr "Mast"
 
-#: build/trans_presets.java:2461
+#. item "Facilities/Clock" combo "Support" display value
+#: build/trans_presets.java:2468
 msgid "wall_mounted"
 msgstr "Wanduhr"
 
-#: build/trans_presets.java:2461
+#. item "Facilities/Clock" combo "Support" display value
+#: build/trans_presets.java:2468
 msgid "billboard"
 msgstr "Werbeschild"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2469
 msgid "Visibility/readability"
 msgstr "Ablesbarkeit"
 
-#: build/trans_presets.java:2462
+#. item "Facilities/Clock" combo "Visibility/readability" display value
+#: build/trans_presets.java:2469
 msgid "(up to 5m)"
 msgstr "(bis zu 5m)"
 
-#: build/trans_presets.java:2462
+#. item "Facilities/Clock" combo "Visibility/readability" display value
+#: build/trans_presets.java:2469
 msgid "(up to 20m)"
 msgstr "(bis zu 20m)"
 
-#: build/trans_presets.java:2462
+#. item "Facilities/Clock" combo "Visibility/readability" display value
+#: build/trans_presets.java:2469
 msgid "(more than 20m)"
 msgstr "(mehr als 20m)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2470
 msgid "Shows current date"
 msgstr "Datumsanzeige"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2471
 msgid "Shows temperature"
 msgstr "Temperaturanzeige"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2472
 msgid "Shows barometric pressure"
 msgstr "Luftdruckanzeige"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2473
 msgid "Shows humidity"
 msgstr "Feuchtigkeitsanzeige"
@@ -31320,5 +32332,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2476
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -31327,5 +32339,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2479
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -31333,30 +32345,30 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2481
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2482
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2484
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2485
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2486
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2488
 msgid "Waste Basket"
 msgstr "Abfalleimer"
@@ -31364,5 +32376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2490
 msgid "Edit Waste Basket"
 msgstr "Abfalleimer bearbeiten"
@@ -31371,34 +32383,39 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2497
 msgid "Backrest"
 msgstr "Lehne"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2498
 msgid "Material"
 msgstr "Material"
 
-#: build/trans_presets.java:2491
+#. item "Facilities/Bench" combo "Material" display value
+#: build/trans_presets.java:2498
 msgid "stone"
 msgstr "Stein"
 
-#: build/trans_presets.java:2491
+#. item "Facilities/Bench" combo "Material" display value
+#: build/trans_presets.java:2498
 msgid "plastic"
 msgstr "Kunststoff"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2499
 msgid "Colour"
 msgstr "Farbe"
 
-#: build/trans_presets.java:2492
+#. item "Facilities/Bench" combo "Colour" display value
+#: build/trans_presets.java:2499
 msgid "black"
 msgstr "schwarz"
 
-#: build/trans_presets.java:2492
+#. item "Facilities/Bench" combo "Colour" display value
+#: build/trans_presets.java:2499
 msgid "brown"
 msgstr "braun"
 
+#. item "Facilities/Bench" combo "Colour" display value
 #. </rule>
 #.
@@ -31462,5 +32479,5 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2492 build/trans_style.java:2635
+#: build/trans_presets.java:2499 build/trans_style.java:2635
 #: build/trans_style.java:2641 build/trans_style.java:2647
 #: build/trans_style.java:2653 build/trans_style.java:2659
@@ -31471,37 +32488,41 @@
 msgstr "grün"
 
-#: build/trans_presets.java:2492
+#. item "Facilities/Bench" combo "Colour" display value
+#: build/trans_presets.java:2499
 msgid "red"
 msgstr "rot"
 
-#: build/trans_presets.java:2492
+#. item "Facilities/Bench" combo "Colour" display value
+#: build/trans_presets.java:2499
 msgid "blue"
 msgstr "blau"
 
-#: build/trans_presets.java:2492
+#. item "Facilities/Bench" combo "Colour" display value
+#: build/trans_presets.java:2499
 msgid "gray"
 msgstr "grau"
 
-#: build/trans_presets.java:2492
+#. item "Facilities/Bench" combo "Colour" display value
+#: build/trans_presets.java:2499
 msgid "white"
 msgstr "weiß"
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2500
 msgid "Amount of Seats"
 msgstr "Anzahl der Sitzplätze"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2503
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2508
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2509
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -31510,27 +32531,30 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2504 build/trans_presets.java:3767
+#: build/trans_presets.java:2511 build/trans_presets.java:3774
 msgid "Height"
 msgstr "Höhe"
 
-#: build/trans_presets.java:2504
+#. item "Facilities/Hunting Stand" combo "Height" display value
+#: build/trans_presets.java:2511
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2504
+#. item "Facilities/Hunting Stand" combo "Height" display value
+#: build/trans_presets.java:2511
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2504
+#. item "Facilities/Hunting Stand" combo "Height" display value
+#: build/trans_presets.java:2511
 msgid "full"
 msgstr "voll"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2513
 msgid "Hide"
 msgstr "Versteck"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2514
 msgid "Lock"
 msgstr "Schloß"
@@ -31538,5 +32562,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2517
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -31545,10 +32569,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2520
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2524
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -31557,5 +32581,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2527
 msgid "Edit Fire Hydrant"
 msgstr "Hydrant bearbeiten"
@@ -31564,20 +32588,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2525 build/trans_presets.java:3288
+#: build/trans_presets.java:2532 build/trans_presets.java:3295
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2533
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2534
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2535
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -31591,6 +32615,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2532 build/trans_presets.java:2541
-#: build/trans_presets.java:2550 build/trans_presets.java:2559
+#: build/trans_presets.java:2539 build/trans_presets.java:2548
+#: build/trans_presets.java:2557 build/trans_presets.java:2566
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -31936,6 +32960,6 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 #: build/trans_style.java:3071 build/trans_style.java:3077
 #: build/trans_style.java:3083 build/trans_style.java:3089
@@ -31969,246 +32993,390 @@
 msgstr "Sport"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "american_football"
 msgstr "American Football"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "canadian_football"
 msgstr "Canadian Football"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "gaelic_football"
 msgstr "Gaelic Football"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "rugby_league"
 msgstr "Rugby League"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "rugby_union"
 msgstr "Rugby Union"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:2534 build/trans_presets.java:2543
-#: build/trans_presets.java:2552 build/trans_presets.java:2561
+#. item "Sports/Sport Facilities/Stadium" combo "sport" display value
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport" display value
+#. item "Sports/Sport Facilities/Pitch" combo "sport" display value
+#. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
+#: build/trans_presets.java:2541 build/trans_presets.java:2550
+#: build/trans_presets.java:2559 build/trans_presets.java:2568
 msgid "tennis"
 msgstr "Tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2543
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2544
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2552
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2553
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2561
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2562
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2570
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2571
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2576
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2577
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
 #. group "Sport"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2583
 msgid "Sport"
 msgstr "Sport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2584
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2585
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -32256,247 +33424,416 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2581 build/trans_presets.java:2587
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2668 build/trans_presets.java:2675
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2695 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2779
-#: build/trans_presets.java:2785 build/trans_presets.java:2791
-#: build/trans_presets.java:2797 build/trans_presets.java:2803
-#: build/trans_presets.java:2809 build/trans_presets.java:2815
-#: build/trans_presets.java:2823 build/trans_presets.java:2829
-#: build/trans_presets.java:2835 build/trans_presets.java:2841
-#: build/trans_presets.java:2848 build/trans_presets.java:2854
+#: build/trans_presets.java:2588 build/trans_presets.java:2594
+#: build/trans_presets.java:2600 build/trans_presets.java:2606
+#: build/trans_presets.java:2612 build/trans_presets.java:2618
+#: build/trans_presets.java:2624 build/trans_presets.java:2630
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2675 build/trans_presets.java:2682
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2714 build/trans_presets.java:2720
+#: build/trans_presets.java:2726 build/trans_presets.java:2732
+#: build/trans_presets.java:2738 build/trans_presets.java:2762
+#: build/trans_presets.java:2768 build/trans_presets.java:2774
+#: build/trans_presets.java:2780 build/trans_presets.java:2786
+#: build/trans_presets.java:2792 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2810
+#: build/trans_presets.java:2816 build/trans_presets.java:2822
+#: build/trans_presets.java:2830 build/trans_presets.java:2836
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
 msgid "type"
 msgstr "Typ"
 
-#: build/trans_presets.java:2581 build/trans_presets.java:2587
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2668 build/trans_presets.java:2675
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2695 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2749 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2779
-#: build/trans_presets.java:2785 build/trans_presets.java:2791
-#: build/trans_presets.java:2797 build/trans_presets.java:2803
-#: build/trans_presets.java:2809 build/trans_presets.java:2815
-#: build/trans_presets.java:2823 build/trans_presets.java:2829
-#: build/trans_presets.java:2835 build/trans_presets.java:2841
-#: build/trans_presets.java:2848 build/trans_presets.java:2854
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Volleyball" combo "Type" display value
+#. item "Sport (Ball)/Beachvolleyball" combo "Type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#. item "Motorsport/Karting" combo "type" display value
+#. item "Motorsport/Motocross" combo "type" display value
+#. item "Motorsport/Safety Training" combo "type" display value
+#. item "Motorsport/Model Aerodrome" combo "type" display value
+#. item "Motorsport/RC Car" combo "type" display value
+#: build/trans_presets.java:2588 build/trans_presets.java:2594
+#: build/trans_presets.java:2600 build/trans_presets.java:2606
+#: build/trans_presets.java:2612 build/trans_presets.java:2618
+#: build/trans_presets.java:2624 build/trans_presets.java:2630
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2675 build/trans_presets.java:2682
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2714 build/trans_presets.java:2720
+#: build/trans_presets.java:2726 build/trans_presets.java:2732
+#: build/trans_presets.java:2738 build/trans_presets.java:2747
+#: build/trans_presets.java:2756 build/trans_presets.java:2762
+#: build/trans_presets.java:2768 build/trans_presets.java:2774
+#: build/trans_presets.java:2780 build/trans_presets.java:2786
+#: build/trans_presets.java:2792 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2810
+#: build/trans_presets.java:2816 build/trans_presets.java:2822
+#: build/trans_presets.java:2830 build/trans_presets.java:2836
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:2581 build/trans_presets.java:2587
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2668 build/trans_presets.java:2675
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2695 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2749 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2779
-#: build/trans_presets.java:2785 build/trans_presets.java:2791
-#: build/trans_presets.java:2797 build/trans_presets.java:2803
-#: build/trans_presets.java:2809 build/trans_presets.java:2815
-#: build/trans_presets.java:2823 build/trans_presets.java:2829
-#: build/trans_presets.java:2835 build/trans_presets.java:2841
-#: build/trans_presets.java:2848 build/trans_presets.java:2854
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Volleyball" combo "Type" display value
+#. item "Sport (Ball)/Beachvolleyball" combo "Type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#. item "Motorsport/Karting" combo "type" display value
+#. item "Motorsport/Motocross" combo "type" display value
+#. item "Motorsport/Safety Training" combo "type" display value
+#. item "Motorsport/Model Aerodrome" combo "type" display value
+#. item "Motorsport/RC Car" combo "type" display value
+#: build/trans_presets.java:2588 build/trans_presets.java:2594
+#: build/trans_presets.java:2600 build/trans_presets.java:2606
+#: build/trans_presets.java:2612 build/trans_presets.java:2618
+#: build/trans_presets.java:2624 build/trans_presets.java:2630
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2675 build/trans_presets.java:2682
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2714 build/trans_presets.java:2720
+#: build/trans_presets.java:2726 build/trans_presets.java:2732
+#: build/trans_presets.java:2738 build/trans_presets.java:2747
+#: build/trans_presets.java:2756 build/trans_presets.java:2762
+#: build/trans_presets.java:2768 build/trans_presets.java:2774
+#: build/trans_presets.java:2780 build/trans_presets.java:2786
+#: build/trans_presets.java:2792 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2810
+#: build/trans_presets.java:2816 build/trans_presets.java:2822
+#: build/trans_presets.java:2830 build/trans_presets.java:2836
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:2581 build/trans_presets.java:2587
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2668 build/trans_presets.java:2675
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2695 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2749 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2779
-#: build/trans_presets.java:2785 build/trans_presets.java:2791
-#: build/trans_presets.java:2797 build/trans_presets.java:2803
-#: build/trans_presets.java:2809 build/trans_presets.java:2815
-#: build/trans_presets.java:2823
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Volleyball" combo "Type" display value
+#. item "Sport (Ball)/Beachvolleyball" combo "Type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#: build/trans_presets.java:2588 build/trans_presets.java:2594
+#: build/trans_presets.java:2600 build/trans_presets.java:2606
+#: build/trans_presets.java:2612 build/trans_presets.java:2618
+#: build/trans_presets.java:2624 build/trans_presets.java:2630
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2675 build/trans_presets.java:2682
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2714 build/trans_presets.java:2720
+#: build/trans_presets.java:2726 build/trans_presets.java:2732
+#: build/trans_presets.java:2738 build/trans_presets.java:2747
+#: build/trans_presets.java:2756 build/trans_presets.java:2762
+#: build/trans_presets.java:2768 build/trans_presets.java:2774
+#: build/trans_presets.java:2780 build/trans_presets.java:2786
+#: build/trans_presets.java:2792 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2810
+#: build/trans_presets.java:2816 build/trans_presets.java:2822
+#: build/trans_presets.java:2830
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:2581 build/trans_presets.java:2587
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2668 build/trans_presets.java:2675
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2695 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2779
-#: build/trans_presets.java:2785 build/trans_presets.java:2791
-#: build/trans_presets.java:2797 build/trans_presets.java:2803
-#: build/trans_presets.java:2809 build/trans_presets.java:2815
-#: build/trans_presets.java:2823 build/trans_presets.java:2829
-#: build/trans_presets.java:2835 build/trans_presets.java:2841
-#: build/trans_presets.java:2848 build/trans_presets.java:2854
+#. item "Sport/Multi" combo "type" display value
+#. item "Sport/10pin" combo "type" display value
+#. item "Sport/Athletics" combo "type" display value
+#. item "Sport/Archery" combo "type" display value
+#. item "Sport/Climbing" combo "type" display value
+#. item "Sport/Canoeing" combo "type" display value
+#. item "Sport/Cycling" combo "type" display value
+#. item "Sport/Dog Racing" combo "type" display value
+#. item "Sport/Equestrian" combo "type" display value
+#. item "Sport/Horse Racing" combo "type" display value
+#. item "Sport/Gymnastics" combo "type" display value
+#. item "Sport/Skating" combo "type" display value
+#. item "Sport/Skateboard" combo "type" display value
+#. item "Sport/Swimming" combo "type" display value
+#. item "Sport/Skiing" combo "type" display value
+#. item "Sport/Shooting" combo "type" display value
+#. item "Sport (Ball)/Soccer" combo "type" display value
+#. item "Sport (Ball)/Australian Football" combo "type" display value
+#. item "Sport (Ball)/American Football" combo "type" display value
+#. item "Sport (Ball)/Canadian Football" combo "type" display value
+#. item "Sport (Ball)/Gaelic Football" combo "type" display value
+#. item "Sport (Ball)/Rugby League" combo "type" display value
+#. item "Sport (Ball)/Rugby Union" combo "type" display value
+#. item "Sport (Ball)/Baseball" combo "type" display value
+#. item "Sport (Ball)/Basketball" combo "type" display value
+#. item "Sport (Ball)/Golf" combo "type" display value
+#. item "Sport (Ball)/Boule" combo "type" display value
+#. item "Sport (Ball)/Bowls" combo "type" display value
+#. item "Sport (Ball)/Cricket" combo "type" display value
+#. item "Sport (Ball)/Cricket Nets" combo "type" display value
+#. item "Sport (Ball)/Croquet" combo "type" display value
+#. item "Sport (Ball)/Hockey" combo "type" display value
+#. item "Sport (Ball)/Pelota" combo "type" display value
+#. item "Sport (Ball)/Racquet" combo "type" display value
+#. item "Sport (Ball)/Table Tennis" combo "type" display value
+#. item "Sport (Ball)/Tennis" combo "type" display value
+#. item "Motorsport/Motorsport" combo "type" display value
+#. item "Motorsport/Karting" combo "type" display value
+#. item "Motorsport/Motocross" combo "type" display value
+#. item "Motorsport/Safety Training" combo "type" display value
+#. item "Motorsport/Model Aerodrome" combo "type" display value
+#. item "Motorsport/RC Car" combo "type" display value
+#: build/trans_presets.java:2588 build/trans_presets.java:2594
+#: build/trans_presets.java:2600 build/trans_presets.java:2606
+#: build/trans_presets.java:2612 build/trans_presets.java:2618
+#: build/trans_presets.java:2624 build/trans_presets.java:2630
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2675 build/trans_presets.java:2682
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2714 build/trans_presets.java:2720
+#: build/trans_presets.java:2726 build/trans_presets.java:2732
+#: build/trans_presets.java:2738 build/trans_presets.java:2762
+#: build/trans_presets.java:2768 build/trans_presets.java:2774
+#: build/trans_presets.java:2780 build/trans_presets.java:2786
+#: build/trans_presets.java:2792 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2810
+#: build/trans_presets.java:2816 build/trans_presets.java:2822
+#: build/trans_presets.java:2830 build/trans_presets.java:2836
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2861
 msgid "track"
 msgstr "Weg"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2590
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2591
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2596
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2597
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2602
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2603
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2601
+#: build/trans_presets.java:2608
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2609
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2614
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2615
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2621
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2626
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2627
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2632
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2633
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2638
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2639
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2644
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2645
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2650
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2651
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2656
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2657
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2662
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2663
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -32504,52 +33841,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2670
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2673
 msgid "Piste type"
 msgstr "Pistentyp"
 
-#: build/trans_presets.java:2666
+#. item "Sport/Skiing" combo "Piste type" display value
+#: build/trans_presets.java:2673
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:2666
+#. item "Sport/Skiing" combo "Piste type" display value
+#: build/trans_presets.java:2673
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:2666
+#. item "Sport/Skiing" combo "Piste type" display value
+#: build/trans_presets.java:2673
 msgid "snow_park"
 msgstr "Schneepark"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2674
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: build/trans_presets.java:2667
+#. item "Sport/Skiing" combo "Difficulty" display value
+#: build/trans_presets.java:2674
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:2667
+#. item "Sport/Skiing" combo "Difficulty" display value
+#: build/trans_presets.java:2674
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:2667
+#. item "Sport/Skiing" combo "Difficulty" display value
+#: build/trans_presets.java:2674
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:2667
+#. item "Sport/Skiing" combo "Difficulty" display value
+#: build/trans_presets.java:2674
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:2667
+#. item "Sport/Skiing" combo "Difficulty" display value
+#: build/trans_presets.java:2674
 msgid "freeride"
 msgstr "Freistil"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2677
 msgid "Shooting"
 msgstr "Schießen"
@@ -32557,105 +33902,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2679
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2685
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2686
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2687
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2692
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2693
 msgid "Edit Australian Football"
 msgstr "Australian Football-Platz bearbeiten"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2698
 msgid "American Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2699
 msgid "Edit American Football"
 msgstr "American Football ändern"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2704
 msgid "Canadian Football"
 msgstr "Canadian Football"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2705
 msgid "Edit Canadian Football"
 msgstr "Canadian Football ändern"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2710
 msgid "Gaelic Football"
 msgstr "Gaelic Football"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2711
 msgid "Edit Gaelic Football"
 msgstr "Gaelic Football ändern"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2716
 msgid "Rugby League"
 msgstr "Rugby League"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2717
 msgid "Edit Rugby League"
 msgstr "Rugby League ändern"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2722
 msgid "Rugby Union"
 msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2723
 msgid "Edit Rugby Union"
 msgstr "Rugby Union ändern"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2728
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2729
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2734
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2735
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2740
 msgid "Volleyball"
 msgstr "Volleyball"
@@ -32663,10 +34008,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2742
 msgid "Edit Volleyball"
 msgstr "Volleyball bearbeiten"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2749
 msgid "Beachvolleyball"
 msgstr "Beachvolleyball"
@@ -32674,119 +34019,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2751
 msgid "Edit Beachvolleyball"
 msgstr "Beachvolleyball bearbeiten"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2758
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2759
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
-#: build/trans_presets.java:2755
+#. item "Sport (Ball)/Golf" combo "type" display value
+#: build/trans_presets.java:2762
 msgid "golf_course"
 msgstr "Golfanlage"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2764
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2765
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2770
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2771
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2776
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2777
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2782
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2783
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2788
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2789
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2794
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2795
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2800
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2801
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2806
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2807
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2812
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2813
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2818
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2819
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
@@ -32794,40 +34140,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2818 build/trans_presets.java:2819
+#: build/trans_presets.java:2825 build/trans_presets.java:2826
 msgid "Motorsport"
 msgstr "Motorsport"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2827
 msgid "Edit Motorsport"
 msgstr "Motorsport ändern"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2832
 msgid "Karting"
 msgstr "Kartfahren"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2833
 msgid "Edit Karting"
 msgstr "Kartfahrplatz bearbeiten"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2838
 msgid "Motocross"
 msgstr "Motocross"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2839
 msgid "Edit Motocross"
 msgstr "Motocrossgelände bearbeiten"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2844
 msgid "Safety Training"
 msgstr "Sicherheitstraining"
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2845
 msgid "Edit Safety Training"
 msgstr "Sicherheitstrainingsgebiet bearbeiten"
@@ -32835,20 +34181,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2851
 msgid "Model Aerodrome"
 msgstr "Modellflugplatz"
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2852
 msgid "Edit Model Aerodrome"
 msgstr "Modellflugplatz bearbeiten"
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2857
 msgid "RC Car"
 msgstr "RC-Modellauto"
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2858
 msgid "Edit RC Car"
 msgstr "Platz für Motellautos bearbeiten"
@@ -32856,10 +34202,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:2858 build/trans_presets.java:2859
+#: build/trans_presets.java:2865 build/trans_presets.java:2866
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2867
 msgid "Building"
 msgstr "Gebäude"
@@ -32867,23 +34213,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2870
 msgid "Tower"
 msgstr "Turm"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2871
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2874
 msgid "Tower type"
 msgstr "Art des Turms"
 
-#: build/trans_presets.java:2867
+#. item "Man Made/Man Made/Tower" combo "Tower type" display value
+#: build/trans_presets.java:2874
 msgid "communication"
 msgstr "Kommunikation"
 
-#: build/trans_presets.java:2867
+#. item "Man Made/Man Made/Tower" combo "Tower type" display value
+#: build/trans_presets.java:2874
 msgid "observation"
 msgstr "Beobachtung"
@@ -32892,5 +34240,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:2869 build/trans_presets.java:2890
+#: build/trans_presets.java:2876 build/trans_presets.java:2897
 msgid "Height (meters)"
 msgstr "Höhe (in Meter)"
@@ -32898,5 +34246,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2880
 msgid "Flagpole"
 msgstr "Fahnenmast"
@@ -32906,15 +34254,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2885
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2886
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2890
 msgid "Chimney"
 msgstr "Schornstein"
@@ -32922,10 +34270,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2892
 msgid "Edit Chimney"
 msgstr "Schornstein bearbeiten"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2899
 msgid "Windmill"
 msgstr "Windmühle"
@@ -32933,20 +34281,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2901
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2905
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2906
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2910
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -32955,40 +34303,48 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2913
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
-#: build/trans_presets.java:2909 build/trans_presets.java:3035
+#. item "Man Made/Man Made/Pipeline" combo "Type" display value
+#. item "Power/Power Generator" combo "Type" display value
+#: build/trans_presets.java:2916 build/trans_presets.java:3042
 msgid "gas"
 msgstr "Gas"
 
-#: build/trans_presets.java:2909
+#. item "Man Made/Man Made/Pipeline" combo "Type" display value
+#: build/trans_presets.java:2916
 msgid "heat"
 msgstr "Wärme"
 
-#: build/trans_presets.java:2909
+#. item "Man Made/Man Made/Pipeline" combo "Type" display value
+#: build/trans_presets.java:2916
 msgid "oil"
 msgstr "Öl"
 
-#: build/trans_presets.java:2909
+#. item "Man Made/Man Made/Pipeline" combo "Type" display value
+#: build/trans_presets.java:2916
 msgid "sewage"
 msgstr "Abwasser"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2917
 msgid "Location"
 msgstr "Lage"
 
-#: build/trans_presets.java:2910
+#. item "Man Made/Man Made/Pipeline" combo "Location" display value
+#: build/trans_presets.java:2917
 msgctxt "pipeline"
 msgid "underground"
 msgstr "unterirdisch"
 
-#: build/trans_presets.java:2910
+#. item "Man Made/Man Made/Pipeline" combo "Location" display value
+#: build/trans_presets.java:2917
 msgctxt "pipeline"
 msgid "underwater"
 msgstr "unterseeisch"
 
-#: build/trans_presets.java:2910
+#. item "Man Made/Man Made/Pipeline" combo "Location" display value
+#: build/trans_presets.java:2917
 msgctxt "pipeline"
 msgid "overground"
@@ -32996,5 +34352,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2919
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -33002,10 +34358,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2921
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2925
 msgid "Mineshaft"
 msgstr "Bergwerksschacht"
@@ -33014,23 +34370,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:2921
+#: build/trans_presets.java:2928
 msgid "Edit Mineshaft"
 msgstr "Bergwerksschacht bearbeiten"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2931
 msgid "Function"
 msgstr "Funktion"
 
-#: build/trans_presets.java:2924
+#. item "Man Made/Man Made/Mineshaft" combo "Function" display value
+#: build/trans_presets.java:2931
 msgid "winding"
 msgstr "Winde"
 
-#: build/trans_presets.java:2924
+#. item "Man Made/Man Made/Mineshaft" combo "Function" display value
+#: build/trans_presets.java:2931
 msgid "air"
 msgstr "Luftschacht"
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2932
 msgid "Depth in meters"
 msgstr "Tiefe in Metern"
@@ -33038,79 +34396,114 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "Resource"
 msgstr "Fördergut"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "aggregate"
 msgstr "Gemische"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "bauxite"
 msgstr "Bauxit"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
-#: build/trans_presets.java:3035
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#. item "Power/Power Generator" combo "Type" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
+#: build/trans_presets.java:3042
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "copper"
 msgstr "Kupfer"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "dimension_stone"
 msgstr "Naturstein"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "gold"
 msgstr "Gold"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "ilmenite"
 msgstr "Titaneisenerz"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "iron_ore"
 msgstr "Eisenerz"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "lead"
 msgstr "Blei"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "limestone"
 msgstr "Kalkstein"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "nickel"
 msgstr "Nickel"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "rutile"
 msgstr "Rutil"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "salt"
 msgstr "Salz"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "silver"
 msgstr "Silber"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "tin"
 msgstr "Zinn"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "zinc"
 msgstr "Zink"
 
-#: build/trans_presets.java:2927 build/trans_presets.java:2938
+#. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
+#. item "Man Made/Man Made/Adit" combo "Resource" display value
+#: build/trans_presets.java:2934 build/trans_presets.java:2945
 msgid "zircon"
 msgstr "Zirkon"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2935
 msgid "Visible Headframe"
 msgstr "Sichtbares Fördergerüst"
@@ -33118,10 +34511,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:2929 build/trans_presets.java:2939
+#: build/trans_presets.java:2936 build/trans_presets.java:2946
 msgid "Disused"
 msgstr "Stillgelegt"
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2938
 msgid "Adit"
 msgstr "Stollenzugang"
@@ -33129,10 +34522,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2940
 msgid "Edit Adit"
 msgstr "Stollenzugang bearbeiten"
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2943
 msgid "Length in meters"
 msgstr "Länge in Metern"
@@ -33140,15 +34533,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2949
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2950
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2954
 msgid "Water Works"
 msgstr "Wasserwerk"
@@ -33156,10 +34549,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works" />
 #. item "Man Made/Man Made/Water Works" label "Edit Water Works"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2956
 msgid "Edit Water Works"
 msgstr "Wasserwerk bearbeiten"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2962
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -33169,10 +34562,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2966
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2970
 msgid "Watermill"
 msgstr "Wassermühle"
@@ -33180,10 +34573,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2972
 msgid "Edit Watermill"
 msgstr "Wassermühle bearbeiten"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2977
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -33192,10 +34585,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2980
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2984
 msgid "Water Well"
 msgstr "Brunnen"
@@ -33203,5 +34596,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
 #. item "Man Made/Man Made/Water Well" label "Edit Water Well"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2986
 msgid "Edit Water Well"
 msgstr "Brunnen bearbeiten"
@@ -33209,5 +34602,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2991
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -33215,5 +34608,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2993
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
@@ -33221,10 +34614,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2999
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3003
 msgid "Street Lamp"
 msgstr "Straßenlampe"
@@ -33232,5 +34625,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp" />
 #. item "Man Made/Man Made/Street Lamp" label "Edit Street Lamp"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3005
 msgid "Edit Street Lamp"
 msgstr "Straßenlampe bearbeiten"
@@ -33239,14 +34632,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3008
 msgid "Operation times"
 msgstr "Betriebszeit"
 
-#: build/trans_presets.java:3001
+#. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
+#: build/trans_presets.java:3008
 msgid "Mo-Fr 22:00-05:00"
 msgstr "Mo-Fr 22:00-05:00"
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3010
 msgid "Measurement Station"
 msgstr "Messstation"
@@ -33254,48 +34648,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
 #. item "Man Made/Man Made/Measurement Station" label "Edit Measurement Station"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3012
 msgid "Edit Measurement Station"
 msgstr "Messstation bearbeiten"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3017
 msgid "Measurement"
 msgstr "Messart"
 
-#: build/trans_presets.java:3010
+#. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
+#: build/trans_presets.java:3017
 msgid "particulate_matter"
 msgstr "Feststoffe"
 
-#: build/trans_presets.java:3010
+#. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
+#: build/trans_presets.java:3017
 msgid "seismic"
 msgstr "seismisch"
 
-#: build/trans_presets.java:3010
+#. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
+#: build/trans_presets.java:3017
 msgid "water_level"
 msgstr "Wasserstand"
 
-#: build/trans_presets.java:3010
+#. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
+#: build/trans_presets.java:3017
 msgid "weather"
 msgstr "Wetter"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3018
 msgid "Recording"
 msgstr "Aufnahmeart"
 
-#: build/trans_presets.java:3011
+#. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
+#: build/trans_presets.java:3018
 msgid "manually"
 msgstr "manuell"
 
-#: build/trans_presets.java:3011
+#. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
+#: build/trans_presets.java:3018
 msgid "automated"
 msgstr "automatisiert"
 
-#: build/trans_presets.java:3011
+#. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
+#: build/trans_presets.java:3018
 msgid "remote"
 msgstr "ferngesteuert"
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3021
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -33303,10 +34704,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3023
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3027
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -33314,27 +34715,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3029
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
 
-#: build/trans_presets.java:3025
+#. item "Man Made/Man Made/Surveillance" combo "Type" display value
+#: build/trans_presets.java:3032
 msgid "indoor"
 msgstr "im Gebäude"
 
-#: build/trans_presets.java:3025
+#. item "Man Made/Man Made/Surveillance" combo "Type" display value
+#: build/trans_presets.java:3032
 msgid "outdoor"
 msgstr "im Freien"
 
-#: build/trans_presets.java:3025
+#. item "Man Made/Man Made/Surveillance" combo "Type" display value
+#: build/trans_presets.java:3032
 msgid "public"
 msgstr "öffentlich"
 
 #. group "Power"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3035
 msgid "Power"
 msgstr "Energieversorgung"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3036
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -33344,30 +34748,35 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3040
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
-#: build/trans_presets.java:3035
+#. item "Power/Power Generator" combo "Type" display value
+#: build/trans_presets.java:3042
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:3035
+#. item "Power/Power Generator" combo "Type" display value
+#: build/trans_presets.java:3042
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:3035
+#. item "Power/Power Generator" combo "Type" display value
+#: build/trans_presets.java:3042
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:3035
+#. item "Power/Power Generator" combo "Type" display value
+#: build/trans_presets.java:3042
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:3035
+#. item "Power/Power Generator" combo "Type" display value
+#: build/trans_presets.java:3042
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3045
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -33376,10 +34785,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3048
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3054
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -33388,5 +34797,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Power/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3057
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -33394,10 +34803,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3053 build/trans_presets.java:3086
+#: build/trans_presets.java:3060 build/trans_presets.java:3093
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3062
 msgid "Cable Distribution Cabinet"
 msgstr "Kabelverteilerschrank"
@@ -33406,5 +34815,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
 #. item "Power/Cable Distribution Cabinet" label "Edit Cable Distribution Cabinet"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3065
 msgid "Edit Cable Distribution Cabinet"
 msgstr "Kabelverteilerschrank bearbeiten"
@@ -33412,5 +34821,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3071
 msgid "Power Tower"
 msgstr "Strommast"
@@ -33421,5 +34830,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3076
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
@@ -33427,10 +34836,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3078
 msgid "Tower reference"
 msgstr "Identifikation des Turms"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3080
 msgid "Pole"
 msgstr "Kleiner Freileitungsmast"
@@ -33439,5 +34848,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3083
 msgid "Edit Power Pole"
 msgstr "Kleinen Freileitungsmast bearbeiten"
@@ -33445,10 +34854,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3085
 msgid "Pole reference"
 msgstr "Mast-Referenznummer"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3087
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -33457,19 +34866,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3090
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:3091
 msgid "Line type"
 msgstr "Art der Stromleitung"
 
-#: build/trans_presets.java:3084
+#. item "Power/Power Line" combo "Line type" display value
+#: build/trans_presets.java:3091
 msgctxt "Power Line"
 msgid "line"
 msgstr "Freileitung (Starkstrom)"
 
-#: build/trans_presets.java:3084
+#. item "Power/Power Line" combo "Line type" display value
+#: build/trans_presets.java:3091
 msgctxt "Power Line"
 msgid "minor_line"
@@ -33477,36 +34888,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3096
 msgid "Amount of Cables"
 msgstr "Anzahl Leitungen"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3097
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel"
 
-#: build/trans_presets.java:3090
+#. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
+#: build/trans_presets.java:3097
 msgid "single"
 msgstr "einzeln"
 
-#: build/trans_presets.java:3090
+#. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
+#: build/trans_presets.java:3097
 msgid "double"
 msgstr "doppelt"
 
-#: build/trans_presets.java:3090
+#. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
+#: build/trans_presets.java:3097
 msgid "triple"
 msgstr "dreifach"
 
-#: build/trans_presets.java:3090
+#. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
+#: build/trans_presets.java:3097
 msgid "quad"
 msgstr "vierfach"
 
 #. group "Historic Places"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3100
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3101
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -33515,20 +34930,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3104
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3109
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3110
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3115
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -33537,10 +34952,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3118
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3116
+#: build/trans_presets.java:3123
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -33548,10 +34963,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3125
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3129
 msgid "Palaeontological Site"
 msgstr "Paläontologische Stätte"
@@ -33559,5 +34974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3131
 msgid "Edit Palaeontological Site"
 msgstr "Paläontologische Stätte bearbeiten"
@@ -33565,15 +34980,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3136
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3137
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3141
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -33581,60 +34996,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3143
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:3147
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3148
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3152
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3153
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3157
 msgid "Boundary Stone"
 msgstr "Grenzstein"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3158
 msgid "Edit Boundary Stone"
 msgstr "Grenzstein bearbeiten"
 
 #. group "Shops"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3164
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3165
 msgid "Food"
 msgstr "Lebensmittel"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3166
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3167
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3172
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -33642,10 +35057,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3174
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3179
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -33653,5 +35068,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3181
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
@@ -33659,5 +35074,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3187
 msgid "Baker"
 msgstr "Bäcker"
@@ -33665,10 +35080,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3189
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3194
 msgid "Butcher"
 msgstr "Fleischer"
@@ -33676,10 +35091,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3196
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3201
 msgid "Seafood"
 msgstr "Fischhändler"
@@ -33687,10 +35102,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3203
 msgid "Edit Seafood"
 msgstr "Fischhändler bearbeiten"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3210
 msgid "Deli (Fine Food)"
 msgstr "Feinkost"
@@ -33698,10 +35113,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
 #. item "Shops/Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3212
 msgid "Edit Deli (Fine Food)"
 msgstr "Feinkost bearbeiten"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3219
 msgid "Confectionery"
 msgstr "Süßwaren"
@@ -33709,5 +35124,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3214
+#: build/trans_presets.java:3221
 msgid "Edit Confectionery"
 msgstr "Süßwaren bearbeiten"
@@ -33715,5 +35130,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3220
+#: build/trans_presets.java:3227
 msgid "Marketplace"
 msgstr "Marktplatz"
@@ -33721,10 +35136,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3229
 msgid "Edit Marketplace"
 msgstr "Marktplatz bearbeiten"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3236
 msgid "Greengrocer"
 msgstr "Obst- und Gemüseladen"
@@ -33732,15 +35147,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3238
 msgid "Edit Greengrocer"
 msgstr "Obst- und Gemüseladen bearbeiten"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3245
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3246
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
@@ -33748,5 +35163,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3252
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -33754,25 +35169,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3254
 msgid "Edit Alcohol Shop"
 msgstr "Spirituosengeschäft bearbeiten"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3259
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3253
+#: build/trans_presets.java:3260
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3268
 msgid "Edit Clothes Shop"
 msgstr "Bekleidungsgeschäft ändern"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3273
 msgid "Boutique"
 msgstr "Boutique"
@@ -33780,20 +35195,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3275
 msgid "Edit Boutique"
 msgstr "Boutique bearbeiten"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3282
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3283
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3288
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -33801,10 +35216,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3290
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3289
+#: build/trans_presets.java:3296
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
@@ -33812,5 +35227,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3295
+#: build/trans_presets.java:3302
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -33818,10 +35233,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3304
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3302
+#: build/trans_presets.java:3309
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -33829,20 +35244,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3304
+#: build/trans_presets.java:3311
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:3316
 msgid "Tailor"
 msgstr "Schneider"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3317
 msgid "Edit Tailor"
 msgstr "Schneider ändern"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3322
 msgid "Fabric"
 msgstr "Textilgeschäft"
@@ -33850,35 +35265,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3317
+#: build/trans_presets.java:3324
 msgid "Edit Fabric"
 msgstr "Textilgeschäft bearbeiten"
 
 #. group "Electronic"
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:3332
 msgid "Electronic"
 msgstr "Elektronik"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:3333
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3327
+#: build/trans_presets.java:3334
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3332
+#: build/trans_presets.java:3339
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3340
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3338
+#: build/trans_presets.java:3345
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
@@ -33886,10 +35301,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3347
 msgid "Edit Mobile Phone"
 msgstr "Mobiltelefon bearbeiten"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3354
 msgid "Vacuum Cleaner"
 msgstr "Staubsauger"
@@ -33897,35 +35312,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3349
+#: build/trans_presets.java:3356
 msgid "Edit Vacuum Cleaner"
 msgstr "Staubsauger bearbeiten"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3356
+#: build/trans_presets.java:3363
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3357
+#: build/trans_presets.java:3364
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3362
+#: build/trans_presets.java:3369
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3363
+#: build/trans_presets.java:3370
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
 #. group "Cash"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3376
 msgid "Cash"
 msgstr "Geld"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3370
+#: build/trans_presets.java:3377
 msgid "Bank"
 msgstr "Bank"
@@ -33933,5 +35348,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3379
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
@@ -33939,10 +35354,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3377 build/trans_presets.java:3386
+#: build/trans_presets.java:3384 build/trans_presets.java:3393
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3386
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -33950,5 +35365,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3381
+#: build/trans_presets.java:3388
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -33956,10 +35371,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3388
+#: build/trans_presets.java:3395
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3394
+#: build/trans_presets.java:3401
 msgid "Department Store"
 msgstr "Warenhaus"
@@ -33967,10 +35382,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3403
 msgid "Edit Department Store"
 msgstr "Warenhaus bearbeiten"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3403
+#: build/trans_presets.java:3410
 msgid "Mall"
 msgstr "Einkaufszentrum (Mall)"
@@ -33978,5 +35393,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3405
+#: build/trans_presets.java:3412
 msgid "Edit Mall"
 msgstr "Einkaufszentrum (Mall) bearbeiten"
@@ -33984,35 +35399,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:3420
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3414
+#: build/trans_presets.java:3421
 msgid "Edit Chemist"
 msgstr "Drogerie bearbeiten"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3426
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3420
+#: build/trans_presets.java:3427
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:3432
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3433
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3438
 msgid "Jewelry"
 msgstr "Juwelier"
@@ -34020,10 +35435,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3440
 msgid "Edit Jewelry"
 msgstr "Juwelier bearbeiten"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3447
 msgid "Erotic"
 msgstr "Erotikhandel"
@@ -34031,5 +35446,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3449
 msgid "Edit Erotic"
 msgstr "Erotikhandel bearbeiten"
@@ -34037,5 +35452,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3457
 msgid "Florist"
 msgstr "Blumenladen"
@@ -34043,10 +35458,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3459
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3457
+#: build/trans_presets.java:3464
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -34054,5 +35469,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3466
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
@@ -34060,5 +35475,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3465
+#: build/trans_presets.java:3472
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -34066,10 +35481,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3467
+#: build/trans_presets.java:3474
 msgid "Edit Do-it-yourself-store"
 msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3472
+#: build/trans_presets.java:3479
 msgid "Hardware"
 msgstr "Eisenwaren"
@@ -34077,10 +35492,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3474
+#: build/trans_presets.java:3481
 msgid "Edit Hardware Store"
 msgstr "Eisenwaren bearbeiten"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:3486
 msgid "Paint"
 msgstr "Farben"
@@ -34088,5 +35503,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3481
+#: build/trans_presets.java:3488
 msgid "Edit Paint"
 msgstr "Farben bearbeiten"
@@ -34094,15 +35509,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3489
+#: build/trans_presets.java:3496
 msgid "Furniture"
 msgstr "Möbel"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3490
+#: build/trans_presets.java:3497
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3495
+#: build/trans_presets.java:3502
 msgid "Kitchen"
 msgstr "Küchenstudio"
@@ -34110,10 +35525,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3497
+#: build/trans_presets.java:3504
 msgid "Edit Kitchen"
 msgstr "Küchenstudio bearbeiten"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3504
+#: build/trans_presets.java:3511
 msgid "Curtain"
 msgstr "Gardinen"
@@ -34121,10 +35536,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3506
+#: build/trans_presets.java:3513
 msgid "Edit Curtain"
 msgstr "Gardinen bearbeiten"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:3520
 msgid "Frame"
 msgstr "Bilderrahmen"
@@ -34132,5 +35547,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3522
 msgid "Edit Frames"
 msgstr "Bilderrahmen bearbeiten"
@@ -34138,15 +35553,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3523
+#: build/trans_presets.java:3530
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3524
+#: build/trans_presets.java:3531
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3529
+#: build/trans_presets.java:3536
 msgid "Copyshop"
 msgstr "Copyshop"
@@ -34154,15 +35569,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3531
+#: build/trans_presets.java:3538
 msgid "Edit Copyshop"
 msgstr "Copyshop bearbeiten"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3538
+#: build/trans_presets.java:3545
 msgid "Book Store"
 msgstr "Buchhandlung"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3539
+#: build/trans_presets.java:3546
 msgid "Edit Book Store"
 msgstr "Buchhandlung bearbeiten"
@@ -34170,15 +35585,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3545
+#: build/trans_presets.java:3552
 msgid "Travel Agency"
 msgstr "Reisebüro"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3546
+#: build/trans_presets.java:3553
 msgid "Edit Travel Agency"
 msgstr "Reisebüro bearbeiten"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3558
 msgid "Musical Instrument"
 msgstr "Musikhaus"
@@ -34186,20 +35601,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3553
+#: build/trans_presets.java:3560
 msgid "Edit Musical Instruments"
 msgstr "Musikhaus bearbeiten"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3560
+#: build/trans_presets.java:3567
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3561
+#: build/trans_presets.java:3568
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3573
 msgid "Variety Store"
 msgstr "1-Euro-Laden"
@@ -34207,10 +35622,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3568
+#: build/trans_presets.java:3575
 msgid "Edit Variety Store"
 msgstr "1-Euro-Laden bearbeiten"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3576
+#: build/trans_presets.java:3583
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -34218,5 +35633,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3578
+#: build/trans_presets.java:3585
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -34224,201 +35639,220 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" combo "Vending products"
-#: build/trans_presets.java:3580
+#: build/trans_presets.java:3587
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "bicycle_tube"
 msgstr "Fahrradschlauch"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:3580
+#. item "Vending machine" combo "Vending products" display value
+#: build/trans_presets.java:3587
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. group "Geography"
-#: build/trans_presets.java:3592 build/trans_presets.java:3709
+#: build/trans_presets.java:3599 build/trans_presets.java:3716
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3593
+#: build/trans_presets.java:3600
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3601
 msgid "National"
 msgstr "Staat"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3602
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3600
+#: build/trans_presets.java:3607
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3608
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3606
+#: build/trans_presets.java:3613
 msgid "Civil"
 msgstr "Zivil"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3607
+#: build/trans_presets.java:3614
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3612
+#: build/trans_presets.java:3619
 msgid "Political"
 msgstr "Politisch"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3613
+#: build/trans_presets.java:3620
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3625
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3619
+#: build/trans_presets.java:3626
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. group "Places"
-#: build/trans_presets.java:3625
+#: build/trans_presets.java:3632
 msgid "Places"
 msgstr "Orte"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3626
+#: build/trans_presets.java:3633
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3627
+#: build/trans_presets.java:3634
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3634
+#: build/trans_presets.java:3641
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Places/State"
-#: build/trans_presets.java:3640
+#: build/trans_presets.java:3647
 msgid "State"
 msgstr "Bundesland"
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3641
+#: build/trans_presets.java:3648
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3647
+#: build/trans_presets.java:3654
 msgid "Region"
 msgstr "Region"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3648
+#: build/trans_presets.java:3655
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Places/County"
-#: build/trans_presets.java:3654
+#: build/trans_presets.java:3661
 msgid "County"
 msgstr "Landkreis"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3655
+#: build/trans_presets.java:3662
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3663
+#: build/trans_presets.java:3670
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3669
+#: build/trans_presets.java:3676
 msgid "Town"
 msgstr "Stadt"
@@ -34426,10 +35860,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3671
+#: build/trans_presets.java:3678
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3677
+#: build/trans_presets.java:3684
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -34437,25 +35871,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3679
+#: build/trans_presets.java:3686
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3685
+#: build/trans_presets.java:3692
 msgid "Village"
 msgstr "Dorf"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3686
+#: build/trans_presets.java:3693
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3692
+#: build/trans_presets.java:3699
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3693
+#: build/trans_presets.java:3700
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -34463,5 +35897,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3700
+#: build/trans_presets.java:3707
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -34469,10 +35903,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3702
+#: build/trans_presets.java:3709
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3710
+#: build/trans_presets.java:3717
 msgid "Peak"
 msgstr "Bergspitze"
@@ -34480,10 +35914,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3712
+#: build/trans_presets.java:3719
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3725
 msgid "Glacier"
 msgstr "Gletscher"
@@ -34491,10 +35925,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3720
+#: build/trans_presets.java:3727
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3726
+#: build/trans_presets.java:3733
 msgid "Volcano"
 msgstr "Vulkan"
@@ -34502,10 +35936,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3735
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3741
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -34513,5 +35947,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3736
+#: build/trans_presets.java:3743
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
@@ -34519,5 +35953,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3742
+#: build/trans_presets.java:3749
 msgid "Island"
 msgstr "Insel"
@@ -34525,10 +35959,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3744
+#: build/trans_presets.java:3751
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3750
+#: build/trans_presets.java:3757
 msgid "Islet"
 msgstr "Kleine Insel"
@@ -34536,15 +35970,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3752
+#: build/trans_presets.java:3759
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
 
 #. group "Nature"
-#: build/trans_presets.java:3759
+#: build/trans_presets.java:3766
 msgid "Nature"
 msgstr "Natur"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3760
+#: build/trans_presets.java:3767
 msgid "Tree"
 msgstr "Baum"
@@ -34553,15 +35987,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3770
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3775
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:3770
+#: build/trans_presets.java:3777
 msgid "Wood"
 msgstr "Naturwald"
@@ -34570,22 +36004,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:3773
+#: build/trans_presets.java:3780
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
 
-#: build/trans_presets.java:3776 build/trans_presets.java:3785
+#. item "Nature/Wood" combo "Type" display value
+#. item "Nature/Forest" combo "Type" display value
+#: build/trans_presets.java:3783 build/trans_presets.java:3792
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:3776 build/trans_presets.java:3785
+#. item "Nature/Wood" combo "Type" display value
+#. item "Nature/Forest" combo "Type" display value
+#: build/trans_presets.java:3783 build/trans_presets.java:3792
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:3776 build/trans_presets.java:3785
+#. item "Nature/Wood" combo "Type" display value
+#. item "Nature/Forest" combo "Type" display value
+#: build/trans_presets.java:3783 build/trans_presets.java:3792
 msgid "mixed"
 msgstr "Mischwald"
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:3785
 msgid "Forest"
 msgstr "Forst"
@@ -34594,15 +36034,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:3781
+#: build/trans_presets.java:3788
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3787
+#: build/trans_presets.java:3794
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:3788
+#: build/trans_presets.java:3795
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -34610,15 +36050,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:3793
+#: build/trans_presets.java:3800
 msgid "Scree"
 msgstr "Geröll"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:3794
+#: build/trans_presets.java:3801
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:3798
+#: build/trans_presets.java:3805
 msgid "Fell"
 msgstr "Gebirge"
@@ -34626,20 +36066,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3807
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3811
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3812
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:3809
+#: build/trans_presets.java:3816
 msgid "Heath"
 msgstr "Heide"
@@ -34647,15 +36087,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:3811
+#: build/trans_presets.java:3818
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
 
 #. group "Land use"
-#: build/trans_presets.java:3816
+#: build/trans_presets.java:3823
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:3817
+#: build/trans_presets.java:3824
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -34664,40 +36104,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:3827
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3825
+#: build/trans_presets.java:3832
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:3826
+#: build/trans_presets.java:3833
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3831
+#: build/trans_presets.java:3838
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3839
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3837
+#: build/trans_presets.java:3844
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:3845
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:3843
+#: build/trans_presets.java:3850
 msgid "Greenhouse Horticulture"
 msgstr "Gewächshäuser"
@@ -34705,15 +36145,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3852
 msgid "Edit Greenhouse Horticulture"
 msgstr "Gewächshäuser bearbeiten"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3858
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3859
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -34721,25 +36161,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:3858
+#: build/trans_presets.java:3865
 msgid "Garden"
 msgstr "Garten"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:3859
+#: build/trans_presets.java:3866
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3863
+#: build/trans_presets.java:3870
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3871
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:3869
+#: build/trans_presets.java:3876
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -34747,10 +36187,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
 #. item "Land use/Village Green" label "Edit Village Green Landuse"
-#: build/trans_presets.java:3871
+#: build/trans_presets.java:3878
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:3876
+#: build/trans_presets.java:3883
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -34758,20 +36198,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:3878
+#: build/trans_presets.java:3885
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3882
+#: build/trans_presets.java:3889
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:3883
+#: build/trans_presets.java:3890
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3894
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -34779,5 +36219,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
 #. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
-#: build/trans_presets.java:3889
+#: build/trans_presets.java:3896
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -34785,15 +36225,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3895
+#: build/trans_presets.java:3902
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:3896
+#: build/trans_presets.java:3903
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:3901
+#: build/trans_presets.java:3908
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -34801,10 +36241,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:3903
+#: build/trans_presets.java:3910
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:3909
+#: build/trans_presets.java:3916
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -34812,40 +36252,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:3911
+#: build/trans_presets.java:3918
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:3925
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:3919
+#: build/trans_presets.java:3926
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3931
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3932
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3930
+#: build/trans_presets.java:3937
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3938
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:3936
+#: build/trans_presets.java:3943
 msgid "Garages"
 msgstr "Garagen"
@@ -34853,10 +36293,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:3938
+#: build/trans_presets.java:3945
 msgid "Edit Garages"
 msgstr "Garagen bearbeiten"
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:3944
+#: build/trans_presets.java:3951
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -34864,15 +36304,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3953
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3951
+#: build/trans_presets.java:3958
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:3952
+#: build/trans_presets.java:3959
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -34880,55 +36320,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3958
+#: build/trans_presets.java:3965
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:3959
+#: build/trans_presets.java:3966
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3971
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:3965
+#: build/trans_presets.java:3972
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3970
+#: build/trans_presets.java:3977
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:3971
+#: build/trans_presets.java:3978
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3976
+#: build/trans_presets.java:3983
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:3977
+#: build/trans_presets.java:3984
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3982
+#: build/trans_presets.java:3989
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:3983
+#: build/trans_presets.java:3990
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
 
 #. group "Annotation"
-#: build/trans_presets.java:3990
+#: build/trans_presets.java:3997
 msgid "Annotation"
 msgstr "Anmerkung"
@@ -34937,5 +36377,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:3994
+#: build/trans_presets.java:4001
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -34943,5 +36383,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:4003
 msgid "House number"
 msgstr "Hausnummer"
@@ -34949,5 +36389,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:3998
+#: build/trans_presets.java:4005
 msgid "House name"
 msgstr "Hausname"
@@ -34956,48 +36396,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:3999 build/trans_presets.java:4116
+#: build/trans_presets.java:4006 build/trans_presets.java:4123
 msgid "Street name"
 msgstr "Straßenname"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4000
+#: build/trans_presets.java:4007
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:4008
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4002
+#: build/trans_presets.java:4009
 msgid "Country code"
 msgstr "Länderkennung"
 
-#: build/trans_presets.java:4002
+#. item "Annotation/Addresses" combo "Country code" display value
+#: build/trans_presets.java:4009
 msgid "AT"
 msgstr "AT"
 
-#: build/trans_presets.java:4002
+#. item "Annotation/Addresses" combo "Country code" display value
+#: build/trans_presets.java:4009
 msgid "CH"
 msgstr "CH"
 
-#: build/trans_presets.java:4002
+#. item "Annotation/Addresses" combo "Country code" display value
+#: build/trans_presets.java:4009
 msgid "DE"
 msgstr "DE"
 
-#: build/trans_presets.java:4002
+#. item "Annotation/Addresses" combo "Country code" display value
+#: build/trans_presets.java:4009
 msgid "FR"
 msgstr "FR"
 
-#: build/trans_presets.java:4002
+#. item "Annotation/Addresses" combo "Country code" display value
+#: build/trans_presets.java:4009
 msgid "GB"
 msgstr "GB"
 
-#: build/trans_presets.java:4002
+#. item "Annotation/Addresses" combo "Country code" display value
+#: build/trans_presets.java:4009
 msgid "IT"
 msgstr "IT"
 
-#: build/trans_presets.java:4002
+#. item "Annotation/Addresses" combo "Country code" display value
+#: build/trans_presets.java:4009
 msgid "US"
 msgstr "US"
@@ -35006,5 +36453,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4008
+#: build/trans_presets.java:4015
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -35012,32 +36459,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4010
+#: build/trans_presets.java:4017
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
-#: build/trans_presets.java:4010
+#. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
+#: build/trans_presets.java:4017
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:4010
+#. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
+#: build/trans_presets.java:4017
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:4010
+#. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
+#: build/trans_presets.java:4017
 msgid "alphabetic"
 msgstr "alphabetisch"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4012
+#: build/trans_presets.java:4019
 msgid "Contact"
 msgstr "Kontakt"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4013
+#: build/trans_presets.java:4020
 msgid "Edit Contact information"
 msgstr "Kontaktinformationen ändern"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4029
 msgid "Image"
 msgstr "Bild"
@@ -35047,5 +36497,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4030
+#: build/trans_presets.java:4037
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -35057,5 +36507,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4036 build/trans_presets.java:4053
+#: build/trans_presets.java:4043 build/trans_presets.java:4060
 msgid "outer segment"
 msgstr "Äußeres Segment"
@@ -35063,5 +36513,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4037 build/trans_presets.java:4054
+#: build/trans_presets.java:4044 build/trans_presets.java:4061
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -35069,5 +36519,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4047
 msgid "Boundary"
 msgstr "Grenze"
@@ -35078,5 +36528,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4045
+#: build/trans_presets.java:4052
 msgid "Edit Boundary"
 msgstr "Grenze anpassen"
@@ -35084,36 +36534,40 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4049
+#: build/trans_presets.java:4056
 msgid "Boundary type"
 msgstr "Grenztyp"
 
-#: build/trans_presets.java:4049
+#. item "Relations/Boundary" combo "Boundary type" display value
+#: build/trans_presets.java:4056
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:4049
+#. item "Relations/Boundary" combo "Boundary type" display value
+#: build/trans_presets.java:4056
 msgid "national"
 msgstr "national"
 
-#: build/trans_presets.java:4049
+#. item "Relations/Boundary" combo "Boundary type" display value
+#: build/trans_presets.java:4056
 msgid "civil"
 msgstr "zivil"
 
-#: build/trans_presets.java:4049
+#. item "Relations/Boundary" combo "Boundary type" display value
+#: build/trans_presets.java:4056
 msgid "political"
 msgstr "politisch"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4057
 msgid "Administrative level"
 msgstr "Administrationsebene"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4062
 msgid "Sub area"
 msgstr "Teilgebiet"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4056
+#: build/trans_presets.java:4063
 msgid "Administration centre"
 msgstr "Administrationszentrum"
@@ -35121,5 +36575,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4059
+#: build/trans_presets.java:4066
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -35128,5 +36582,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4069
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -35134,33 +36588,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:4071
 msgid "Restriction"
 msgstr "Einschränkung"
 
-#: build/trans_presets.java:4064
+#. item "Relations/Turn restriction" combo "Restriction" display value
+#: build/trans_presets.java:4071
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:4064
+#. item "Relations/Turn restriction" combo "Restriction" display value
+#: build/trans_presets.java:4071
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:4064
+#. item "Relations/Turn restriction" combo "Restriction" display value
+#: build/trans_presets.java:4071
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:4064
+#. item "Relations/Turn restriction" combo "Restriction" display value
+#: build/trans_presets.java:4071
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:4064
+#. item "Relations/Turn restriction" combo "Restriction" display value
+#: build/trans_presets.java:4071
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:4064
+#. item "Relations/Turn restriction" combo "Restriction" display value
+#: build/trans_presets.java:4071
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:4064
+#. item "Relations/Turn restriction" combo "Restriction" display value
+#: build/trans_presets.java:4071
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -35169,15 +36630,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4069
+#: build/trans_presets.java:4076
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:4070
+#: build/trans_presets.java:4077
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4078
 msgid "to way"
 msgstr "Zu Weg"
@@ -35185,5 +36646,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4074
+#: build/trans_presets.java:4081
 msgid "Route"
 msgstr "Route"
@@ -35192,5 +36653,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4084
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -35198,24 +36659,29 @@
 #. <key key="type" value="route" />
 #. item "Relations/Route" combo "Route type"
-#: build/trans_presets.java:4079
+#: build/trans_presets.java:4086
 msgid "Route type"
 msgstr "Routentyp"
 
-#: build/trans_presets.java:4079
+#. item "Relations/Route" combo "Route type" display value
+#: build/trans_presets.java:4086
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:4079
+#. item "Relations/Route" combo "Route type" display value
+#: build/trans_presets.java:4086
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:4079
+#. item "Relations/Route" combo "Route type" display value
+#: build/trans_presets.java:4086
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:4079
+#. item "Relations/Route" combo "Route type" display value
+#: build/trans_presets.java:4086
 msgid "ski"
 msgstr "Ski"
 
+#. item "Relations/Route" combo "Route type" display value
 #. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
 #. </rule>
@@ -35263,5 +36729,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4079 build/trans_style.java:200
+#: build/trans_presets.java:4086 build/trans_style.java:200
 #: build/trans_style.java:526 build/trans_style.java:532
 #: build/trans_style.java:552 build/trans_style.java:558
@@ -35271,16 +36737,20 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:4079
+#. item "Relations/Route" combo "Route type" display value
+#: build/trans_presets.java:4086
 msgid "hiking"
 msgstr "T1 - Bergweg"
 
-#: build/trans_presets.java:4079
+#. item "Relations/Route" combo "Route type" display value
+#: build/trans_presets.java:4086
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:4079
+#. item "Relations/Route" combo "Route type" display value
+#: build/trans_presets.java:4086
 msgid "detour"
 msgstr "Umleitung"
 
+#. item "Relations/Route" combo "Route type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -35289,10 +36759,10 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4079 build/trans_style.java:973
+#: build/trans_presets.java:4086 build/trans_style.java:973
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Symbol description"
-#: build/trans_presets.java:4082
+#: build/trans_presets.java:4089
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -35302,31 +36772,35 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4085 build/trans_presets.java:4105
+#: build/trans_presets.java:4092 build/trans_presets.java:4112
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:4087
+#: build/trans_presets.java:4094
 msgid "Route state"
 msgstr "Routenstatus"
 
-#: build/trans_presets.java:4087
+#. item "Relations/Route" combo "Route state" display value
+#: build/trans_presets.java:4094
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:4087
+#. item "Relations/Route" combo "Route state" display value
+#: build/trans_presets.java:4094
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:4087
+#. item "Relations/Route" combo "Route state" display value
+#: build/trans_presets.java:4094
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:4087
+#. item "Relations/Route" combo "Route state" display value
+#: build/trans_presets.java:4094
 msgid "connection"
 msgstr "Verbindung"
 
 #. item "Relations/Route" text "Color (hex)"
-#: build/trans_presets.java:4088
+#: build/trans_presets.java:4095
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -35335,30 +36809,30 @@
 #. <roles>
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4098
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4092
+#: build/trans_presets.java:4099
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4093
+#: build/trans_presets.java:4100
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:4094
+#: build/trans_presets.java:4101
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:4095
+#: build/trans_presets.java:4102
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "backward halt point"
-#: build/trans_presets.java:4096
+#: build/trans_presets.java:4103
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -35366,5 +36840,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4099
+#: build/trans_presets.java:4106
 msgid "Route network"
 msgstr "Liniennetz"
@@ -35372,5 +36846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4101
+#: build/trans_presets.java:4108
 msgid "Edit route network"
 msgstr "Liniennetz bearbeiten"
@@ -35379,5 +36853,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4116
 msgid "member"
 msgstr "Element"
@@ -35385,5 +36859,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4112
+#: build/trans_presets.java:4119
 msgid "Associated street"
 msgstr "Zugehörige Straße"
@@ -35391,10 +36865,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4114
+#: build/trans_presets.java:4121
 msgid "Edit associated street"
 msgstr "Zugehörige Straße bearbeiten"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4126
 msgid "house"
 msgstr "Haus"
@@ -38607,6 +40081,92 @@
 msgstr "Test"
 
-#~ msgid "T3 - difficult"
-#~ msgstr "T3 - exponierter, schwieriger Bergweg"
+#~ msgid "Grab buildings"
+#~ msgstr "Gebäude aufnehmen"
+
+#~ msgid "Extract building on click (vector images only)"
+#~ msgstr "Gebäude durch Klicken extrahieren (nur Vektorbilder)"
+
+#~ msgid ""
+#~ "This feature requires (at least) one special cadastre\n"
+#~ "Buildings layer and an OSM data layer."
+#~ msgstr ""
+#~ "Diese Funktion erfordert (mindestens) eine spezielle cadastre\n"
+#~ "Gebäude-Ebene und eine OSM-Datenebene."
+
+#~ msgid "Grab building layer only"
+#~ msgstr "Nur Gebäude-Ebene holen"
+
+#~ msgid "(save current)"
+#~ msgstr "(Aktuelles speichern)"
+
+#~ msgid "Add offset bookmark"
+#~ msgstr "Versatz-Lesezeichen hinzufügen"
+
+#~ msgid "Could not initialize remote control."
+#~ msgstr "Fernsteuerung konnte nicht initialisiert werden."
+
+#~ msgid "Remote control plugin is not compatible with {0}."
+#~ msgstr "Fernsteuerplugin ist nicht kompatibel mit {0}."
+
+#~ msgid ""
+#~ "{0} will work but remote control for this plugin is disabled.\n"
+#~ "You should update the plugins."
+#~ msgstr ""
+#~ "{0} wird funktionieren, aber die Fernsteuerung für das Plugin wurde "
+#~ "deaktiviert.\n"
+#~ "Die Plugins sollten aktualisiert werden."
+
+#~ msgid ""
+#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+#~ "internal version {5}.\n"
+#~ "If updating the plugins does not help report a bug for \"{0}\"."
+#~ msgstr ""
+#~ "Aktuelle Version von ''{1}'': {2}, interne Version {3}- Benötigte Version "
+#~ "{4}, interne Version {5}.\n"
+#~ "Falls Aktualisieren der Plugins nicht hilft, bitte einen Fehler für "
+#~ "''{0}'' melden."
+
+#~ msgid "{0}: Problem with remote control"
+#~ msgstr "{0}: Problem mit Fernsteuerung"
+
+#~ msgid "Allow remote control (reqires remotecontrol plugin)"
+#~ msgstr "Fernsteuerung erlauben (erfordert remotecontrol-Plugin)"
+
+#~ msgid "Exception occurred"
+#~ msgstr "Fehler"
+
+#~ msgid "No colour"
+#~ msgstr "Keine Farbe"
+
+#~ msgid "White"
+#~ msgstr "Weiss"
+
+#~ msgid "Red"
+#~ msgstr "Rot"
+
+#~ msgid "Orange"
+#~ msgstr "Orange"
+
+#~ msgid "Amber"
+#~ msgstr "Bernstein"
+
+#~ msgid "Yellow"
+#~ msgstr "Gelb"
+
+#~ msgid "Green"
+#~ msgstr "Grün"
+
+#~ msgid "Blue"
+#~ msgstr "Blau"
+
+#~ msgid "Violet"
+#~ msgstr "Violett"
+
+#~ msgid "Black"
+#~ msgstr "Schwarz"
+
+#~ msgid "Experimental union of SlippyMap plugin and WMSPlugin"
+#~ msgstr ""
+#~ "Experimentelle Vereinigung der Plugins \"SlippyMap\" und \"WMSPlugin\""
 
 #~ msgid "Move"
@@ -45060,2 +46620,5 @@
 #~ msgid "demanding_mountain_hiking"
 #~ msgstr "T3 - exponierter, schwieriger Bergweg"
+
+#~ msgid "T3 - difficult"
+#~ msgstr "T3 - exponierter, schwieriger Bergweg"
