Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 23544)
+++ applications/editors/josm/i18n/po/ro.po	(revision 23656)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-10 23:56+0200\n"
+"POT-Creation-Date: 2010-10-16 21:46+0200\n"
 "PO-Revision-Date: 2010-09-12 13:39+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-10-10 21:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 19:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -280,4 +280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
@@ -631,6 +632,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:121
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:120
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:368
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:230
 msgid "Copy"
@@ -679,9 +680,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:132
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:257
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:100
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:753
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:246
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:260
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:278
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
@@ -1394,5 +1395,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:126
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:353
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:398
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:263
 msgid "Paste"
@@ -3984,5 +3985,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "railway"
 msgstr ""
@@ -4072,5 +4073,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4490
+#: build/trans_style.java:4674
 msgid "building"
 msgstr ""
@@ -4424,5 +4425,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
@@ -4564,13 +4565,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1193
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1191
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1194
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1192
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1195
 msgid "Imperial"
 msgstr ""
@@ -5198,5 +5199,5 @@
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:118
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
 msgid "Value"
@@ -5284,5 +5285,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
-#: build/trans_presets.java:3599
+#: build/trans_presets.java:3882
 msgid "all"
 msgstr ""
@@ -5436,5 +5437,5 @@
 #. Strings in GTK ColorChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:150
 #: build/specialmessages.java:85
 msgid "Value:"
@@ -5669,5 +5670,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:106
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
@@ -5922,5 +5923,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3614
+#: build/trans_presets.java:3897
 msgid "Relations"
 msgstr ""
@@ -6026,5 +6027,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:66
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
 msgid "Selection"
 msgstr "Selecţie"
@@ -6562,8 +6563,8 @@
 #. <key key="aerialway" value="goods" />
 #. item "Aerialway/Goods" text "Name"
+#. <key key="amenity" value="parking" />
+#. item "Car/Parking" text "Name"
 #. <optional>
 #. item "Car/Fuel" text "Name"
-#. <key key="amenity" value="parking" />
-#. item "Car/Parking" text "Name"
 #. <key key="amenity" value="car_wash" />
 #. item "Car/Wash" text "Name"
@@ -6611,6 +6612,10 @@
 #. <optional>
 #. item "Public Transport/Bus Stop" text "Name"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dvending_machine" de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity%3Dvending_machine"/>
+#. <key key="amenity" value="vending_machine"/>
+#. <key key="vending" value="public_transport_tickets"/>
+#. item "Public Transport/Ticket Machine" text "Name"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Taxi" text "Name"
+#. item "Taxi" text "Name"
 #. <key key="aeroway" value="aerodrome" />
 #. item "Airport/Airport Ground" text "Name"
@@ -6665,4 +6670,7 @@
 #. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Picnic Site" text "Name"
+#. <space />
+#. <key key="amenity" value="bbq" />
+#. item "Tourism/Public Grill" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
@@ -6718,4 +6726,7 @@
 #. <key key="leisure" value="fishing" />
 #. item "Leisure/Fishing" text "Name"
+#. <space />
+#. <key key="leisure" value="sauna" />
+#. item "Leisure/Sauna" text "Name"
 #. <key key="leisure" value="stadium" />
 #. item "Sports/Sport Facilities/Stadium" text "Name"
@@ -6830,4 +6841,7 @@
 #. <key key="amenity" value="post_office" />
 #. item "Man-Made/Buildings/Post Office" text "Name"
+#. <space />
+#. <key key="amenity" value="studio" />
+#. item "Man-Made/Buildings/Studio" text "Name"
 #. <key key="amenity" value="kindergarten" />
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
@@ -6838,4 +6852,7 @@
 #. <key key="amenity" value="college" />
 #. item "Man-Made/Buildings/College" text "Name"
+#. <space />
+#. <key key="amenity" value="driving_school" />
+#. item "Man-Made/Buildings/Driving School" text "Name"
 #. <key key="amenity" value="cinema" />
 #. item "Man-Made/Buildings/Cinema" text "Name"
@@ -6852,4 +6869,7 @@
 #. <key key="man_made" value="tower" />
 #. item "Man Made/Tower" text "Name"
+#. <space />
+#. <key key="man_made" value="chimney" />
+#. item "Man Made/Chimney" text "Name"
 #. <key key="man_made" value="water_tower" />
 #. item "Man Made/Water Tower" text "Name"
@@ -6860,4 +6880,7 @@
 #. <key key="man_made" value="windmill" />
 #. item "Man Made/Windmill" text "Name"
+#. <space />
+#. <key key="man_made" value="watermill" />
+#. item "Man Made/Watermill" text "Name"
 #. <key key="man_made" value="wastewater_plant" />
 #. item "Man Made/Wastewater Plant" text "Name"
@@ -6885,8 +6908,22 @@
 #. <key key="shop" value="kiosk" />
 #. item "Food/Kiosk" text "Name"
+#. <key key="shop" value="confectionery" />
+#. item "Food/Confectionery" text "Name"
+#. <key key="shop" value="bakery" />
+#. item "Food/Baker" text "Name"
 #. <key key="shop" value="butcher" />
 #. item "Food/Butcher" text "Name"
-#. <key key="shop" value="bakery" />
-#. item "Food/Baker" text "Name"
+#. <space />
+#. <key key="shop" value="seafood" />
+#. item "Food/Seafood" text "Name"
+#. <space />
+#. <key key="shop" value="deli" />
+#. item "Food/Deli (Fine Food)" text "Name"
+#. <space />
+#. <key key="amenity" value="marketplace" />
+#. item "Food/Marketplace" text "Name"
+#. <space />
+#. <key key="shop" value="greengrocer" />
+#. item "Food/Greengrocer" text "Name"
 #. <key key="shop" value="organic" />
 #. item "Food/Organic" text "Name"
@@ -6901,6 +6938,24 @@
 #. <key key="shop" value="optician" />
 #. item "Shops/Optician" text "Name"
+#. <space />
+#. <key key="shop" value="hearing_aids" />
+#. item "Shops/Hearing Aids" text "Name"
+#. <space />
+#. <key key="shop" value="jewelry" />
+#. item "Shops/Jewelry" text "Name"
+#. <space />
+#. <key key="shop" value="erotic" />
+#. item "Shops/Erotic" text "Name"
+#. <space />
+#. <key key="shop" value="department_store" />
+#. item "Shops/Department Store" text "Name"
+#. <space />
+#. <key key="shop" value="mall" />
+#. item "Shops/Mall" text "Name"
 #. <key key="shop" value="clothes" />
 #. item "Shops/Clothes" text "Name"
+#. <space />
+#. <key key="shop" value="boutique" />
+#. item "Shops/Boutique" text "Name"
 #. <key key="shop" value="shoes" />
 #. item "Shops/Shoes" text "Name"
@@ -6915,8 +6970,17 @@
 #. <key key="shop" value="tailor" />
 #. item "Shops/Tailor" text "Name"
+#. <space />
+#. <key key="shop" value="fabric" />
+#. item "Shops/Fabric" text "Name"
 #. <key key="shop" value="computer" />
 #. item "Shops/Computer" text "Name"
 #. <key key="shop" value="electronics" />
 #. item "Shops/Electronics" text "Name"
+#. <space />
+#. <key key="shop" value="mobile_phone" />
+#. item "Shops/Mobile Phone" text "Name"
+#. <space />
+#. <key key="shop" value="vacuum_cleaner" />
+#. item "Shops/Vacuum Cleaner" text "Name"
 #. <key key="shop" value="hifi" />
 #. item "Shops/Hifi" text "Name"
@@ -6929,16 +6993,37 @@
 #. <key key="shop" value="hardware" />
 #. item "Shops/Hardware" text "Name"
+#. <space />
+#. <key key="shop" value="paint" />
+#. item "Shops/Paint" text "Name"
 #. <key key="shop" value="doityourself" />
 #. item "Shops/Do-it-yourself-store" text "Name"
 #. <key key="shop" value="furniture" />
 #. item "Shops/Furniture" text "Name"
+#. <space />
+#. <key key="shop" value="kitchen" />
+#. item "Shops/Kitchen" text "Name"
+#. <space />
+#. <key key="shop" value="curtain" />
+#. item "Shops/Curtain" text "Name"
+#. <space />
+#. <key key="shop" value="frame" />
+#. item "Shops/Frame" text "Name"
 #. <key key="shop" value="stationery" />
 #. item "Shops/Stationery" text "Name"
+#. <space />
+#. <key key="shop" value="copyshop" />
+#. item "Shops/Copyshop" text "Name"
 #. <key key="shop" value="books" />
 #. item "Shops/Book Store" text "Name"
 #. <key key="shop" value="travel_agency" />
 #. item "Shops/Travel Agency" text "Name"
+#. <space />
+#. <key key="shop" value="musical_instrument" />
+#. item "Shops/Musical Instrument" text "Name"
 #. <key key="shop" value="toys" />
 #. item "Shops/Toys" text "Name"
+#. <space />
+#. <key key="shop" value="variety_store" />
+#. item "Shops/Variety Store" text "Name"
 #. <key key="amenity" value="bank" />
 #. item "Cash/Bank" text "Name"
@@ -7117,86 +7202,83 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
-#: build/specialmessages.java:57 build/trans_presets.java:88
-#: build/trans_presets.java:126 build/trans_presets.java:168
-#: build/trans_presets.java:208 build/trans_presets.java:229
-#: build/trans_presets.java:248 build/trans_presets.java:267
-#: build/trans_presets.java:286 build/trans_presets.java:305
-#: build/trans_presets.java:326 build/trans_presets.java:361
-#: build/trans_presets.java:381 build/trans_presets.java:432
-#: build/trans_presets.java:452 build/trans_presets.java:467
-#: build/trans_presets.java:482 build/trans_presets.java:506
-#: build/trans_presets.java:536 build/trans_presets.java:557
-#: build/trans_presets.java:581 build/trans_presets.java:604
-#: build/trans_presets.java:624 build/trans_presets.java:644
-#: build/trans_presets.java:664 build/trans_presets.java:673
-#: build/trans_presets.java:684 build/trans_presets.java:746
-#: build/trans_presets.java:770 build/trans_presets.java:779
-#: build/trans_presets.java:840 build/trans_presets.java:993
-#: build/trans_presets.java:1001 build/trans_presets.java:1009
-#: build/trans_presets.java:1017 build/trans_presets.java:1028
-#: build/trans_presets.java:1037 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1058
-#: build/trans_presets.java:1066 build/trans_presets.java:1073
-#: build/trans_presets.java:1078 build/trans_presets.java:1085
-#: build/trans_presets.java:1090 build/trans_presets.java:1096
-#: build/trans_presets.java:1103 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1125
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1144 build/trans_presets.java:1153
-#: build/trans_presets.java:1160 build/trans_presets.java:1166
-#: build/trans_presets.java:1183 build/trans_presets.java:1190
-#: build/trans_presets.java:1197 build/trans_presets.java:1294
-#: build/trans_presets.java:1345 build/trans_presets.java:1351
-#: build/trans_presets.java:1357 build/trans_presets.java:1363
-#: build/trans_presets.java:1370 build/trans_presets.java:1376
-#: build/trans_presets.java:1381 build/trans_presets.java:1394
-#: build/trans_presets.java:1420 build/trans_presets.java:1435
-#: build/trans_presets.java:1444 build/trans_presets.java:1450
-#: build/trans_presets.java:1458 build/trans_presets.java:1473
-#: build/trans_presets.java:1482 build/trans_presets.java:1492
-#: build/trans_presets.java:1501 build/trans_presets.java:1523
-#: build/trans_presets.java:1531 build/trans_presets.java:1538
-#: build/trans_presets.java:1549 build/trans_presets.java:1559
-#: build/trans_presets.java:1569 build/trans_presets.java:1589
-#: build/trans_presets.java:1601 build/trans_presets.java:1612
-#: build/trans_presets.java:1632 build/trans_presets.java:1641
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1733 build/trans_presets.java:1750
-#: build/trans_presets.java:1767 build/trans_presets.java:1784
-#: build/trans_presets.java:1801 build/trans_presets.java:1819
-#: build/trans_presets.java:1841 build/trans_presets.java:1860
-#: build/trans_presets.java:1881 build/trans_presets.java:1900
-#: build/trans_presets.java:1917 build/trans_presets.java:1936
-#: build/trans_presets.java:1954 build/trans_presets.java:1971
-#: build/trans_presets.java:1988 build/trans_presets.java:2004
-#: build/trans_presets.java:2011 build/trans_presets.java:2020
-#: build/trans_presets.java:2027 build/trans_presets.java:2034
-#: build/trans_presets.java:2041 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2061
-#: build/trans_presets.java:2068 build/trans_presets.java:2085
-#: build/trans_presets.java:2093 build/trans_presets.java:2112
-#: build/trans_presets.java:2122 build/trans_presets.java:2134
-#: build/trans_presets.java:2144 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2165
-#: build/trans_presets.java:2171 build/trans_presets.java:2177
-#: build/trans_presets.java:2183 build/trans_presets.java:2188
-#: build/trans_presets.java:2193 build/trans_presets.java:2198
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2216 build/trans_presets.java:2225
-#: build/trans_presets.java:2234 build/trans_presets.java:2243
-#: build/trans_presets.java:2252 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2275
-#: build/trans_presets.java:2281 build/trans_presets.java:2287
-#: build/trans_presets.java:2293 build/trans_presets.java:2299
-#: build/trans_presets.java:2305 build/trans_presets.java:2311
-#: build/trans_presets.java:2317 build/trans_presets.java:2323
+#: 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:537 build/trans_presets.java:558
+#: build/trans_presets.java:582 build/trans_presets.java:605
+#: build/trans_presets.java:625 build/trans_presets.java:645
+#: build/trans_presets.java:665 build/trans_presets.java:674
+#: build/trans_presets.java:685 build/trans_presets.java:747
+#: build/trans_presets.java:771 build/trans_presets.java:780
+#: build/trans_presets.java:841 build/trans_presets.java:994
+#: build/trans_presets.java:1002 build/trans_presets.java:1010
+#: build/trans_presets.java:1018 build/trans_presets.java:1029
+#: build/trans_presets.java:1038 build/trans_presets.java:1044
+#: build/trans_presets.java:1052 build/trans_presets.java:1059
+#: build/trans_presets.java:1073 build/trans_presets.java:1080
+#: build/trans_presets.java:1085 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1110 build/trans_presets.java:1120
+#: build/trans_presets.java:1126 build/trans_presets.java:1132
+#: build/trans_presets.java:1137 build/trans_presets.java:1143
+#: build/trans_presets.java:1151 build/trans_presets.java:1160
+#: build/trans_presets.java:1167 build/trans_presets.java:1173
+#: build/trans_presets.java:1190 build/trans_presets.java:1197
+#: build/trans_presets.java:1204 build/trans_presets.java:1301
+#: build/trans_presets.java:1352 build/trans_presets.java:1358
+#: build/trans_presets.java:1364 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1388 build/trans_presets.java:1398
+#: build/trans_presets.java:1419 build/trans_presets.java:1451
+#: build/trans_presets.java:1461 build/trans_presets.java:1467
+#: build/trans_presets.java:1475 build/trans_presets.java:1491
+#: build/trans_presets.java:1500 build/trans_presets.java:1510
+#: build/trans_presets.java:1519 build/trans_presets.java:1542
+#: build/trans_presets.java:1550 build/trans_presets.java:1557
+#: build/trans_presets.java:1568 build/trans_presets.java:1578
+#: build/trans_presets.java:1588 build/trans_presets.java:1608
+#: build/trans_presets.java:1620 build/trans_presets.java:1631
+#: build/trans_presets.java:1651 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1731
+#: build/trans_presets.java:1748 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1817 build/trans_presets.java:1834
+#: build/trans_presets.java:1852 build/trans_presets.java:1874
+#: build/trans_presets.java:1893 build/trans_presets.java:1914
+#: build/trans_presets.java:1933 build/trans_presets.java:1950
+#: build/trans_presets.java:1969 build/trans_presets.java:1987
+#: build/trans_presets.java:2004 build/trans_presets.java:2021
+#: build/trans_presets.java:2037 build/trans_presets.java:2044
+#: build/trans_presets.java:2053 build/trans_presets.java:2060
+#: build/trans_presets.java:2067 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2094 build/trans_presets.java:2103
+#: build/trans_presets.java:2110 build/trans_presets.java:2127
+#: build/trans_presets.java:2135 build/trans_presets.java:2154
+#: build/trans_presets.java:2164 build/trans_presets.java:2176
+#: build/trans_presets.java:2186 build/trans_presets.java:2192
+#: build/trans_presets.java:2200 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2225 build/trans_presets.java:2230
+#: build/trans_presets.java:2235 build/trans_presets.java:2240
+#: build/trans_presets.java:2247 build/trans_presets.java:2253
+#: build/trans_presets.java:2258 build/trans_presets.java:2267
+#: build/trans_presets.java:2279 build/trans_presets.java:2288
+#: build/trans_presets.java:2297 build/trans_presets.java:2306
+#: 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:2353 build/trans_presets.java:2360
-#: build/trans_presets.java:2369 build/trans_presets.java:2377
-#: build/trans_presets.java:2383 build/trans_presets.java:2389
-#: build/trans_presets.java:2395 build/trans_presets.java:2401
-#: build/trans_presets.java:2407 build/trans_presets.java:2413
-#: build/trans_presets.java:2419 build/trans_presets.java:2425
+#: build/trans_presets.java:2353 build/trans_presets.java:2359
+#: build/trans_presets.java:2365 build/trans_presets.java:2371
+#: build/trans_presets.java:2377 build/trans_presets.java:2383
+#: build/trans_presets.java:2389 build/trans_presets.java:2395
+#: build/trans_presets.java:2401 build/trans_presets.java:2407
+#: build/trans_presets.java:2414 build/trans_presets.java:2423
 #: build/trans_presets.java:2431 build/trans_presets.java:2437
 #: build/trans_presets.java:2443 build/trans_presets.java:2449
@@ -7204,73 +7286,90 @@
 #: build/trans_presets.java:2467 build/trans_presets.java:2473
 #: build/trans_presets.java:2479 build/trans_presets.java:2485
-#: build/trans_presets.java:2491 build/trans_presets.java:2499
-#: build/trans_presets.java:2505 build/trans_presets.java:2511
-#: build/trans_presets.java:2517 build/trans_presets.java:2524
-#: build/trans_presets.java:2530 build/trans_presets.java:2544
-#: build/trans_presets.java:2550 build/trans_presets.java:2556
-#: build/trans_presets.java:2563 build/trans_presets.java:2570
-#: build/trans_presets.java:2578 build/trans_presets.java:2585
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2624
-#: build/trans_presets.java:2631 build/trans_presets.java:2638
-#: build/trans_presets.java:2645 build/trans_presets.java:2653
-#: build/trans_presets.java:2663 build/trans_presets.java:2668
-#: build/trans_presets.java:2678 build/trans_presets.java:2683
-#: build/trans_presets.java:2689 build/trans_presets.java:2695
-#: build/trans_presets.java:2712 build/trans_presets.java:2718
-#: build/trans_presets.java:2724 build/trans_presets.java:2732
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2755 build/trans_presets.java:2762
-#: build/trans_presets.java:2878 build/trans_presets.java:2885
-#: build/trans_presets.java:2898 build/trans_presets.java:2905
-#: build/trans_presets.java:2912 build/trans_presets.java:2919
-#: build/trans_presets.java:2926 build/trans_presets.java:2932
-#: build/trans_presets.java:2939 build/trans_presets.java:2945
-#: build/trans_presets.java:2953 build/trans_presets.java:2959
-#: build/trans_presets.java:2965 build/trans_presets.java:2972
-#: build/trans_presets.java:2978 build/trans_presets.java:2985
-#: build/trans_presets.java:2991 build/trans_presets.java:2998
-#: build/trans_presets.java:3005 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3024
-#: build/trans_presets.java:3030 build/trans_presets.java:3036
-#: build/trans_presets.java:3044 build/trans_presets.java:3051
-#: build/trans_presets.java:3058 build/trans_presets.java:3065
-#: build/trans_presets.java:3071 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3089
-#: build/trans_presets.java:3095 build/trans_presets.java:3120
-#: build/trans_presets.java:3129 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3158
-#: build/trans_presets.java:3165 build/trans_presets.java:3192
-#: build/trans_presets.java:3203 build/trans_presets.java:3209
-#: build/trans_presets.java:3215 build/trans_presets.java:3221
-#: build/trans_presets.java:3227 build/trans_presets.java:3235
-#: build/trans_presets.java:3242 build/trans_presets.java:3249
-#: build/trans_presets.java:3256 build/trans_presets.java:3263
-#: build/trans_presets.java:3271 build/trans_presets.java:3279
-#: build/trans_presets.java:3287 build/trans_presets.java:3294
-#: build/trans_presets.java:3301 build/trans_presets.java:3310
-#: build/trans_presets.java:3319 build/trans_presets.java:3327
-#: build/trans_presets.java:3335 build/trans_presets.java:3343
-#: build/trans_presets.java:3352 build/trans_presets.java:3360
-#: build/trans_presets.java:3370 build/trans_presets.java:3380
-#: build/trans_presets.java:3389 build/trans_presets.java:3395
-#: build/trans_presets.java:3401 build/trans_presets.java:3407
-#: build/trans_presets.java:3412 build/trans_presets.java:3418
-#: build/trans_presets.java:3428 build/trans_presets.java:3434
-#: build/trans_presets.java:3440 build/trans_presets.java:3446
-#: build/trans_presets.java:3452 build/trans_presets.java:3458
-#: build/trans_presets.java:3464 build/trans_presets.java:3471
-#: build/trans_presets.java:3477 build/trans_presets.java:3482
-#: build/trans_presets.java:3489 build/trans_presets.java:3496
-#: build/trans_presets.java:3502 build/trans_presets.java:3511
-#: build/trans_presets.java:3519 build/trans_presets.java:3525
-#: build/trans_presets.java:3531 build/trans_presets.java:3538
-#: build/trans_presets.java:3544 build/trans_presets.java:3551
-#: build/trans_presets.java:3557 build/trans_presets.java:3563
-#: build/trans_presets.java:3569 build/trans_presets.java:3575
-#: build/trans_presets.java:3622 build/trans_presets.java:3636
-#: build/trans_presets.java:3655 build/trans_presets.java:3669
-#: build/trans_presets.java:3692
+#: build/trans_presets.java:2491 build/trans_presets.java:2497
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2521
+#: build/trans_presets.java:2527 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2553 build/trans_presets.java:2559
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2598 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2617
+#: build/trans_presets.java:2624 build/trans_presets.java:2632
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2653 build/trans_presets.java:2663
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2681 build/trans_presets.java:2688
+#: build/trans_presets.java:2698 build/trans_presets.java:2705
+#: build/trans_presets.java:2712 build/trans_presets.java:2719
+#: build/trans_presets.java:2727 build/trans_presets.java:2737
+#: build/trans_presets.java:2742 build/trans_presets.java:2754
+#: build/trans_presets.java:2761 build/trans_presets.java:2766
+#: build/trans_presets.java:2772 build/trans_presets.java:2778
+#: build/trans_presets.java:2785 build/trans_presets.java:2802
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2973
+#: build/trans_presets.java:2980 build/trans_presets.java:2993
+#: build/trans_presets.java:3000 build/trans_presets.java:3007
+#: build/trans_presets.java:3014 build/trans_presets.java:3021
+#: build/trans_presets.java:3028 build/trans_presets.java:3036
+#: build/trans_presets.java:3045 build/trans_presets.java:3054
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3077 build/trans_presets.java:3083
+#: build/trans_presets.java:3091 build/trans_presets.java:3097
+#: build/trans_presets.java:3103 build/trans_presets.java:3111
+#: build/trans_presets.java:3120 build/trans_presets.java:3129
+#: build/trans_presets.java:3139 build/trans_presets.java:3148
+#: build/trans_presets.java:3156 build/trans_presets.java:3164
+#: build/trans_presets.java:3171 build/trans_presets.java:3178
+#: build/trans_presets.java:3184 build/trans_presets.java:3191
+#: build/trans_presets.java:3198 build/trans_presets.java:3204
+#: build/trans_presets.java:3212 build/trans_presets.java:3220
+#: build/trans_presets.java:3226 build/trans_presets.java:3234
+#: build/trans_presets.java:3243 build/trans_presets.java:3250
+#: build/trans_presets.java:3256 build/trans_presets.java:3264
+#: build/trans_presets.java:3271 build/trans_presets.java:3278
+#: build/trans_presets.java:3286 build/trans_presets.java:3294
+#: build/trans_presets.java:3300 build/trans_presets.java:3308
+#: build/trans_presets.java:3317 build/trans_presets.java:3326
+#: build/trans_presets.java:3333 build/trans_presets.java:3341
+#: build/trans_presets.java:3348 build/trans_presets.java:3354
+#: build/trans_presets.java:3362 build/trans_presets.java:3369
+#: build/trans_presets.java:3377 build/trans_presets.java:3403
+#: build/trans_presets.java:3412 build/trans_presets.java:3427
+#: build/trans_presets.java:3433 build/trans_presets.java:3441
+#: build/trans_presets.java:3448 build/trans_presets.java:3475
+#: build/trans_presets.java:3486 build/trans_presets.java:3492
+#: build/trans_presets.java:3498 build/trans_presets.java:3504
+#: build/trans_presets.java:3510 build/trans_presets.java:3518
+#: build/trans_presets.java:3525 build/trans_presets.java:3532
+#: build/trans_presets.java:3539 build/trans_presets.java:3546
+#: build/trans_presets.java:3554 build/trans_presets.java:3562
+#: build/trans_presets.java:3570 build/trans_presets.java:3577
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3602 build/trans_presets.java:3610
+#: build/trans_presets.java:3618 build/trans_presets.java:3626
+#: build/trans_presets.java:3635 build/trans_presets.java:3643
+#: build/trans_presets.java:3653 build/trans_presets.java:3663
+#: build/trans_presets.java:3672 build/trans_presets.java:3678
+#: build/trans_presets.java:3684 build/trans_presets.java:3690
+#: build/trans_presets.java:3695 build/trans_presets.java:3701
+#: build/trans_presets.java:3711 build/trans_presets.java:3717
+#: build/trans_presets.java:3723 build/trans_presets.java:3729
+#: build/trans_presets.java:3735 build/trans_presets.java:3741
+#: build/trans_presets.java:3747 build/trans_presets.java:3754
+#: build/trans_presets.java:3760 build/trans_presets.java:3765
+#: build/trans_presets.java:3772 build/trans_presets.java:3779
+#: build/trans_presets.java:3785 build/trans_presets.java:3794
+#: build/trans_presets.java:3802 build/trans_presets.java:3808
+#: build/trans_presets.java:3814 build/trans_presets.java:3821
+#: build/trans_presets.java:3827 build/trans_presets.java:3834
+#: build/trans_presets.java:3840 build/trans_presets.java:3846
+#: build/trans_presets.java:3852 build/trans_presets.java:3858
+#: build/trans_presets.java:3905 build/trans_presets.java:3919
+#: build/trans_presets.java:3938 build/trans_presets.java:3952
+#: build/trans_presets.java:3975
 msgid "Name"
 msgstr "Nume"
@@ -8492,4 +8591,5 @@
 #. item "Car/Parking" combo "Type"
 #. item "Motorcycle/Parking" combo "Type"
+#. item "Man-Made/Buildings/Studio" combo "Type"
 #. item "Man Made/Pipeline" combo "Type"
 #. item "Man Made/Surveillance" combo "Type"
@@ -8501,11 +8601,12 @@
 #. item "Nature/Forest" combo "Type"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:430
-#: build/trans_presets.java:719 build/trans_presets.java:728
-#: build/trans_presets.java:1114 build/trans_presets.java:1422
-#: build/trans_presets.java:1494 build/trans_presets.java:2703
-#: build/trans_presets.java:2745 build/trans_presets.java:2754
-#: build/trans_presets.java:2780 build/trans_presets.java:3371
-#: build/trans_presets.java:3381 build/trans_presets.java:3390
+#: build/specialmessages.java:71 build/trans_presets.java:431
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:1121 build/trans_presets.java:1400
+#: build/trans_presets.java:1512 build/trans_presets.java:2655
+#: build/trans_presets.java:2793 build/trans_presets.java:2840
+#: build/trans_presets.java:2849 build/trans_presets.java:2875
+#: build/trans_presets.java:3654 build/trans_presets.java:3664
+#: build/trans_presets.java:3673
 msgid "Type"
 msgstr ""
@@ -8523,16 +8624,17 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
-#: build/trans_presets.java:403 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:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:520
-#: build/trans_presets.java:565 build/trans_presets.java:697
-#: build/trans_presets.java:719 build/trans_presets.java:1325
-#: build/trans_presets.java:1427 build/trans_presets.java:1428
-#: build/trans_presets.java:1429 build/trans_presets.java:2869
-#: build/trans_presets.java:2870 build/trans_presets.java:2871
+#: 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:521
+#: build/trans_presets.java:566 build/trans_presets.java:698
+#: build/trans_presets.java:720 build/trans_presets.java:1332
+#: build/trans_presets.java:1405 build/trans_presets.java:1406
+#: build/trans_presets.java:1407 build/trans_presets.java:2270
+#: build/trans_presets.java:2964 build/trans_presets.java:2965
+#: build/trans_presets.java:2966
 msgid "unknown"
 msgstr "necunoscut"
@@ -9320,20 +9422,20 @@
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:89 build/trans_presets.java:107
-#: build/trans_presets.java:127 build/trans_presets.java:147
-#: build/trans_presets.java:169 build/trans_presets.java:187
-#: build/trans_presets.java:209 build/trans_presets.java:230
-#: 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:368
-#: build/trans_presets.java:388 build/trans_presets.java:438
-#: build/trans_presets.java:453 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:524
-#: build/trans_presets.java:544 build/trans_presets.java:566
-#: build/trans_presets.java:589 build/trans_presets.java:613
-#: build/trans_presets.java:632 build/trans_presets.java:652
-#: build/trans_presets.java:994 build/trans_presets.java:1002
-#: build/trans_presets.java:1010 build/trans_presets.java:1018
-#: build/trans_presets.java:1029 build/trans_presets.java:1300
+#: 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:525
+#: build/trans_presets.java:545 build/trans_presets.java:567
+#: build/trans_presets.java:590 build/trans_presets.java:614
+#: build/trans_presets.java:633 build/trans_presets.java:653
+#: build/trans_presets.java:995 build/trans_presets.java:1003
+#: build/trans_presets.java:1011 build/trans_presets.java:1019
+#: build/trans_presets.java:1030 build/trans_presets.java:1307
 msgid "Layer"
 msgstr "Strat"
@@ -9348,4 +9450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:221
 msgid "Filename"
 msgstr ""
@@ -9810,7 +9913,8 @@
 #. item "Relations/Route" text "Description"
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
-#: build/trans_presets.java:3672
+#: build/trans_presets.java:3955
 msgid "Description"
 msgstr ""
@@ -11330,5 +11434,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:107
@@ -11341,5 +11445,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:191
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid "Please select the row to edit."
@@ -11584,5 +11688,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1392
 msgid "Car"
 msgstr ""
@@ -11606,13 +11710,13 @@
 #. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:405 build/trans_presets.java:518
-#: build/trans_presets.java:796 build/trans_presets.java:815
-#: build/trans_presets.java:829 build/trans_presets.java:851
-#: build/trans_presets.java:888 build/trans_presets.java:901
-#: build/trans_presets.java:913 build/trans_presets.java:925
-#: build/trans_presets.java:937 build/trans_presets.java:949
-#: build/trans_presets.java:959 build/trans_presets.java:968
-#: build/trans_presets.java:977 build/trans_presets.java:1518
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:406 build/trans_presets.java:519
+#: build/trans_presets.java:797 build/trans_presets.java:816
+#: build/trans_presets.java:830 build/trans_presets.java:852
+#: build/trans_presets.java:889 build/trans_presets.java:902
+#: build/trans_presets.java:914 build/trans_presets.java:926
+#: build/trans_presets.java:938 build/trans_presets.java:950
+#: build/trans_presets.java:960 build/trans_presets.java:969
+#: build/trans_presets.java:978 build/trans_presets.java:1537
+#: build/trans_presets.java:1610
 msgid "Bicycle"
 msgstr ""
@@ -11647,12 +11751,12 @@
 #. item "Barriers/Sally Port" check "Foot"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:406 build/trans_presets.java:517
-#: build/trans_presets.java:795 build/trans_presets.java:814
-#: build/trans_presets.java:828 build/trans_presets.java:850
-#: build/trans_presets.java:887 build/trans_presets.java:900
-#: build/trans_presets.java:912 build/trans_presets.java:924
-#: build/trans_presets.java:936 build/trans_presets.java:948
-#: build/trans_presets.java:958 build/trans_presets.java:967
-#: build/trans_presets.java:976
+#: build/trans_presets.java:407 build/trans_presets.java:518
+#: build/trans_presets.java:796 build/trans_presets.java:815
+#: build/trans_presets.java:829 build/trans_presets.java:851
+#: build/trans_presets.java:888 build/trans_presets.java:901
+#: build/trans_presets.java:913 build/trans_presets.java:925
+#: build/trans_presets.java:937 build/trans_presets.java:949
+#: build/trans_presets.java:959 build/trans_presets.java:968
+#: build/trans_presets.java:977
 msgid "Foot"
 msgstr ""
@@ -13152,4 +13256,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:35
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:74
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
@@ -13160,4 +13265,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:80
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
@@ -14793,4 +14899,43 @@
 msgstr ""
 
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:48
+#, fuzzy
+msgid "Download Track ..."
+msgstr "Descarc datele OSM..."
+
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:48
+msgid "Download GPX track from openstreetmap.org"
+msgstr ""
+
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:84
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:149
+#, java-format
+msgid "Invalid URL {0}"
+msgstr ""
+
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:86
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:151
+#, fuzzy, java-format
+msgid "Error fetching URL {0}"
+msgstr "Eroare la prelucrarea {0}: "
+
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:88
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:153
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:155
+#, fuzzy, java-format
+msgid "Error parsing data from URL {0}"
+msgstr "Eroare la prelucrarea {0}: "
+
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:64
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
+#, fuzzy
+msgid "Download Track"
+msgstr "Descărcaţi Obiect"
+
+#: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:213
+#, fuzzy
+msgid "Date"
+msgstr "Duplicare"
+
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
 msgid "Private (only shared as anonymous, unordered points)"
@@ -14823,5 +14968,5 @@
 #. item "Ways/Path" combo "Visibility"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:510
+#: build/trans_presets.java:511
 msgid "Visibility"
 msgstr ""
@@ -14976,5 +15121,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:3594
+#: build/trans_presets.java:3877
 msgid "Address Interpolation"
 msgstr ""
@@ -15417,5 +15562,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2590
 msgid "Buildings"
 msgstr ""
@@ -15651,8 +15796,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2703 build/trans_style.java:1079
+#: build/trans_presets.java:2793 build/trans_style.java:1079
 #: build/trans_style.java:1096 build/trans_style.java:1112
-#: build/trans_style.java:1119 build/trans_style.java:3618
-#: build/trans_style.java:3626
+#: build/trans_style.java:1119 build/trans_style.java:3802
+#: build/trans_style.java:3810
 msgid "water"
 msgstr ""
@@ -15713,6 +15858,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4518 build/trans_style.java:4525
-#: build/trans_style.java:4532 build/trans_style.java:4539
+#: build/trans_style.java:4702 build/trans_style.java:4709
+#: build/trans_style.java:4716 build/trans_style.java:4723
 msgid "address"
 msgstr ""
@@ -16425,5 +16570,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17569,5 +17714,5 @@
 #. group "Public Transport"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1560
 msgid "Public Transport"
 msgstr ""
@@ -17614,5 +17759,5 @@
 #. group "Waypoints"
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:658
+#: build/trans_presets.java:659
 msgid "Waypoints"
 msgstr ""
@@ -17890,29 +18035,29 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:84
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:84
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:89
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:112
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:121
 msgid "Enter weight values"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:194
 #, java-format
 msgid "New value for {0}"
@@ -18365,6 +18510,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:121
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:369
 msgid "Copy to the clipboard"
 msgstr ""
@@ -18551,18 +18696,26 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:161
 msgid "please select a way"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:158
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:172
 #, java-format
 msgid "multiple objects with role ''{0}''"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:259
 msgid "Delete from turn restriction"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:354
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:282
+msgid "Accept the currently selected way"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:283
+msgid "Accept"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:399
 msgid "Paste from the clipboard"
 msgstr ""
@@ -18613,5 +18766,5 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:61
 msgid ""
 "Select the vehicle types this turn restriction is <strong>not</strong> "
@@ -18619,29 +18772,29 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:84
 msgid "Public Service Vehicles"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:85
 msgid "Public service vehicles like buses, tramways, etc."
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:97
 msgid "Heavy Goods Vehicles"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:108
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:110
 msgid "Motorcars"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:122
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:124
 msgid "Bicycles"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:195
 msgid "Use standard exceptions"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:203
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:205
 msgid "Use non-standard exceptions"
 msgstr ""
@@ -18825,7 +18978,7 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
-"a turn restriction, the way with role <tt>from</tt> should be different from "
+"This turn restriction uses the way <span class=\"object-name\">{0}</span> "
+"with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In a "
+"turn restriction, the way with role <tt>from</tt> should be different from "
 "the way with role <tt>to</tt>, though."
 msgstr ""
@@ -18851,4 +19004,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:59
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:30
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:32
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:56
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:33
@@ -18907,13 +19061,13 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
-msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
+msgid "A way with role <tt>from</tt> is required in a turn restriction."
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
-msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
+msgid "A way with role <tt>to</tt> is required in a turn restriction."
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
-msgid "Please go to the Basic editor and manually choose an OSM way."
+msgid "Please go to the Basic editor and manually choose a way."
 msgstr ""
 
@@ -18923,9 +19077,25 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
-msgid "Add an OSM way with role ''from''"
+msgid "Add a way with role ''from''"
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
-msgid "Add an OSM way with role ''to''"
+msgid "Add a way with role ''to''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:24
+msgid ""
+"The two ways participating in the turn restriction <strong>aren''t connected."
+"</strong>"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:26
+msgid ""
+"Make sure you add one or more via objects (nodes or ways) to the turn "
+"restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:33
+msgid "Go to the Advanced Editor and add via objects"
 msgstr ""
 
@@ -18973,19 +19143,37 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
-#, java-format
-msgid ""
-"The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-"should be split at node <span class=\"object-name\">{2}</span> where it "
-"connects to way <span class=\"object-name\">{3}</span>."
-msgstr ""
-
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#.
+#. * from and to intersect at a common node. Both have to be split.
+#.
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:86
+#, java-format
+msgid ""
+"The way <span class=\"object-name\">{0}</span> with role <tt>from</tt> and "
+"the way <span class=\"object-name\">{1}</span> with role <tt>to</tt> "
+"intersect at node <span class=\"object-name\">{2}</span>. <p> Both ways "
+"should be split at the intersecting node."
+msgstr ""
+
+#.
+#. * "to" joins "from" at a common node. Only from has to be split
+#.
+#.
+#. * "from" joins "to" at a common node. Only to has to be split
+#.
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:101
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:113
+#, java-format
+msgid ""
+"The way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> should "
+"be split at node <span class=\"object-name\">{2}</span> where it connects to "
+"way <span class=\"object-name\">{3}</span>."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:127
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
-msgid "Splits the way"
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:128
+msgid "Split the ways"
 msgstr ""
 
@@ -18993,17 +19181,17 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"This turn restriction uses the node <span class=\"object-name\">{0}</span> "
+"as member with role <tt>{1}</tt>."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
+#, java-format
+msgid ""
+"This turn restriction uses the relation <span class=\"object-name\">{0}</"
 "span> as member with role <tt>{1}</tt>."
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
-#, java-format
-msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
-msgstr ""
-
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
-msgid "An OSM way is required instead."
+msgid "A way is required instead."
 msgstr ""
 
@@ -19013,5 +19201,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
-msgid "Change to the Basic Editor and select an OSM way"
+msgid "Change to the Basic Editor and select a way"
 msgstr ""
 
@@ -19146,6 +19334,8 @@
 
 #. * Other messages
+#. item "Motorcycle/Motorcycle Dealer" text "Other"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110
+#: build/trans_presets.java:1529
 msgid "Other"
 msgstr ""
@@ -19362,5 +19552,5 @@
 #. item "Relations/Multipolygon"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3615
+#: build/trans_presets.java:3898
 msgid "Multipolygon"
 msgstr ""
@@ -19877,5 +20067,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4497
+#: build/trans_style.java:4681
 msgid "area"
 msgstr ""
@@ -20719,5 +20909,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3354
+#: build/specialmessages.java:15 build/trans_style.java:3538
 msgid "forest"
 msgstr ""
@@ -21055,6 +21245,11 @@
 msgstr ""
 
+#. Plugin DirectDownload
+#: build/trans_plugins.java:18
+msgid "Download your GPX tracks from openstreetmap.org"
+msgstr ""
+
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:20
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21063,15 +21258,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:22
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:24
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:26
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21080,25 +21275,25 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin gpxfilter
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:32
 msgid "Allows to filter out unnececary GPS tracks"
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21108,20 +21303,20 @@
 
 #. Plugin ImportImagePlugin
-#: build/trans_plugins.java:38 build/trans_plugins.java:40
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
 msgid "Plugin for importing spatial referenced images"
 msgstr ""
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21129,5 +21324,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21137,15 +21332,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21154,5 +21349,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21162,20 +21357,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21183,5 +21378,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21189,5 +21384,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21196,5 +21391,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21203,10 +21398,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21214,20 +21409,20 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21237,5 +21432,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21244,10 +21439,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21256,5 +21451,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21263,20 +21458,20 @@
 
 #. Plugin smed
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21286,15 +21481,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21303,5 +21498,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21310,5 +21505,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21317,10 +21512,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21329,5 +21524,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:116
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21337,5 +21532,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:118
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21344,20 +21539,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:118
+#: build/trans_plugins.java:120
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:120
+#: build/trans_plugins.java:122
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:122
+#: build/trans_plugins.java:124
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:124
+#: build/trans_plugins.java:126
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21366,5 +21561,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:126
+#: build/trans_plugins.java:128
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21372,4 +21567,6 @@
 "Afișează imagini georeferențiate ca fundal în JOSM (servere WMS, Yahoo, ...)."
 
+#. unparsed line <?xml version="1.0" encoding="UTF-8"?>
+#. unparsed line <presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
 #. <!--
 #. Pics have been derived from
@@ -21437,12 +21634,11 @@
 #. are supplied, then "values" will be treated as "display_values" and translated instead.
 #. -->
-#. unparsed line <presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Highways"
 msgstr ""
 
 #. group "Highways/Streets"
-#: build/trans_presets.java:79
+#: build/trans_presets.java:80
 msgid "Streets"
 msgstr ""
@@ -21453,5 +21649,5 @@
 #. </button>
 #. <button label="Motorway" hotkey="1">
-#: build/trans_presets.java:80 build/trans_surveyor.java:72
+#: build/trans_presets.java:81 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -21460,5 +21656,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
 #. item "Highways/Streets/Motorway" label "Edit Motorway"
-#: build/trans_presets.java:83
+#: build/trans_presets.java:84
 msgid "Edit Motorway"
 msgstr ""
@@ -21495,10 +21691,10 @@
 #. item "Man Made/Power Station" text "Reference"
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:86 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:166
-#: build/trans_presets.java:206 build/trans_presets.java:227
-#: build/trans_presets.java:1654 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1704
-#: build/trans_presets.java:2764 build/trans_presets.java:3670
+#: 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:1687 build/trans_presets.java:1695
+#: build/trans_presets.java:1703 build/trans_presets.java:1737
+#: build/trans_presets.java:2859 build/trans_presets.java:3953
 msgid "Reference"
 msgstr ""
@@ -21512,8 +21708,8 @@
 #. item "Highways/Streets/Secondary" combo "Lanes"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
-#: 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:439
+#: 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
 msgid "Lanes"
 msgstr ""
@@ -21537,13 +21733,13 @@
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
-#: 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:231
-#: build/trans_presets.java:257 build/trans_presets.java:336
-#: build/trans_presets.java:370 build/trans_presets.java:391
-#: build/trans_presets.java:413 build/trans_presets.java:454
-#: build/trans_presets.java:469 build/trans_presets.java:525
-#: build/trans_presets.java:545 build/trans_presets.java:1302
+#: 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:526
+#: build/trans_presets.java:546 build/trans_presets.java:1309
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -21582,17 +21778,17 @@
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
-#: 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:249 build/trans_presets.java:269
-#: build/trans_presets.java:288 build/trans_presets.java:307
-#: build/trans_presets.java:327 build/trans_presets.java:349
-#: build/trans_presets.java:362 build/trans_presets.java:382
-#: build/trans_presets.java:400 build/trans_presets.java:433
-#: build/trans_presets.java:491 build/trans_presets.java:516
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:583 build/trans_presets.java:606
-#: build/trans_presets.java:646 build/trans_presets.java:1295
+#: 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:517
+#: build/trans_presets.java:539 build/trans_presets.java:560
+#: build/trans_presets.java:584 build/trans_presets.java:607
+#: build/trans_presets.java:647 build/trans_presets.java:1302
 msgid "Oneway"
 msgstr ""
@@ -21631,17 +21827,17 @@
 #. </button>
 #. <button label="Bridge" hotkey="B" type="toggle">
-#: build/trans_presets.java:93 build/trans_presets.java:111
-#: build/trans_presets.java:132 build/trans_presets.java:152
-#: build/trans_presets.java:174 build/trans_presets.java:192
-#: 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:363
-#: build/trans_presets.java:383 build/trans_presets.java:434
-#: build/trans_presets.java:443 build/trans_presets.java:486
-#: build/trans_presets.java:511 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:584
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:647 build/trans_presets.java:1296
+#: 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:487
+#: build/trans_presets.java:512 build/trans_presets.java:540
+#: build/trans_presets.java:561 build/trans_presets.java:585
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:648 build/trans_presets.java:1303
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21675,17 +21871,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: 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:459 build/trans_presets.java:487
-#: build/trans_presets.java:512 build/trans_presets.java:540
-#: build/trans_presets.java:561 build/trans_presets.java:585
-#: build/trans_presets.java:608 build/trans_presets.java:627
-#: build/trans_presets.java:648 build/trans_presets.java:1297
+#: 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:513 build/trans_presets.java:541
+#: build/trans_presets.java:562 build/trans_presets.java:586
+#: build/trans_presets.java:609 build/trans_presets.java:628
+#: build/trans_presets.java:649 build/trans_presets.java:1304
 msgid "Tunnel"
 msgstr ""
@@ -21716,17 +21912,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: 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:488 build/trans_presets.java:513
-#: build/trans_presets.java:541 build/trans_presets.java:562
-#: build/trans_presets.java:586 build/trans_presets.java:609
-#: build/trans_presets.java:628 build/trans_presets.java:649
-#: build/trans_presets.java:1298
+#: 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:514
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:587 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:650
+#: build/trans_presets.java:1305
 msgid "Cutting"
 msgstr ""
@@ -21757,17 +21953,17 @@
 #. item "Ways/Steps" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
-#: 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:514
-#: build/trans_presets.java:542 build/trans_presets.java:563
-#: build/trans_presets.java:587 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:650
-#: build/trans_presets.java:1299
+#: 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:515
+#: build/trans_presets.java:543 build/trans_presets.java:564
+#: build/trans_presets.java:588 build/trans_presets.java:611
+#: build/trans_presets.java:630 build/trans_presets.java:651
+#: build/trans_presets.java:1306
 msgid "Embankment"
 msgstr ""
@@ -21797,16 +21993,16 @@
 #. item "Ways/Dedicated Footway" check "Lit"
 #. item "Ways/Steps" check "Lit"
-#: 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:351
-#: build/trans_presets.java:367 build/trans_presets.java:387
-#: build/trans_presets.java:490 build/trans_presets.java:515
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:588 build/trans_presets.java:611
-#: build/trans_presets.java:630 build/trans_presets.java:651
+#: 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:516
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:589 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:652
 msgid "Lit"
 msgstr ""
@@ -21814,5 +22010,5 @@
 #. </optional>
 #. item "Highways/Streets/Motorway Link"
-#: build/trans_presets.java:100
+#: build/trans_presets.java:101
 msgid "Motorway Link"
 msgstr ""
@@ -21821,5 +22017,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:103
+#: build/trans_presets.java:104
 msgid "Edit Motorway Link"
 msgstr ""
@@ -21827,5 +22023,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk"
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Trunk"
 msgstr ""
@@ -21834,5 +22030,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
 #. item "Highways/Streets/Trunk" label "Edit Trunk"
-#: build/trans_presets.java:121
+#: build/trans_presets.java:122
 msgid "Edit Trunk"
 msgstr ""
@@ -21842,6 +22038,6 @@
 #. item "Highways/Streets/Primary" check "Motorroad"
 #. item "Highways/Streets/Primary Link" check "Motorroad"
-#: build/trans_presets.java:131 build/trans_presets.java:151
-#: build/trans_presets.java:173 build/trans_presets.java:191
+#: build/trans_presets.java:132 build/trans_presets.java:152
+#: build/trans_presets.java:174 build/trans_presets.java:192
 msgid "Motorroad"
 msgstr ""
@@ -21849,5 +22045,5 @@
 #. </optional>
 #. item "Highways/Streets/Trunk Link"
-#: build/trans_presets.java:139
+#: build/trans_presets.java:140
 msgid "Trunk Link"
 msgstr ""
@@ -21856,5 +22052,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:142
+#: build/trans_presets.java:143
 msgid "Edit Trunk Link"
 msgstr ""
@@ -21867,5 +22063,5 @@
 #. </button>
 #. <button label="Primary" hotkey="2">
-#: build/trans_presets.java:160 build/trans_surveyor.java:76
+#: build/trans_presets.java:161 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -21874,5 +22070,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
 #. item "Highways/Streets/Primary" label "Edit Primary Road"
-#: build/trans_presets.java:163
+#: build/trans_presets.java:164
 msgid "Edit Primary Road"
 msgstr ""
@@ -21880,5 +22076,5 @@
 #. </optional>
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:181
+#: build/trans_presets.java:182
 msgid "Primary Link"
 msgstr ""
@@ -21886,5 +22082,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:183
+#: build/trans_presets.java:184
 msgid "Edit Primary Link"
 msgstr ""
@@ -21896,5 +22092,5 @@
 #. </button>
 #. <button label="Secondary" hotkey="3">
-#: build/trans_presets.java:199 build/trans_surveyor.java:80
+#: build/trans_presets.java:200 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -21904,5 +22100,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
 #. item "Highways/Streets/Secondary" label "Edit Secondary Road"
-#: build/trans_presets.java:203
+#: build/trans_presets.java:204
 msgid "Edit Secondary Road"
 msgstr ""
@@ -21910,5 +22106,5 @@
 #. </optional>
 #. item "Highways/Streets/Tertiary"
-#: build/trans_presets.java:220
+#: build/trans_presets.java:221
 msgid "Tertiary"
 msgstr ""
@@ -21918,5 +22114,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
 #. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
-#: build/trans_presets.java:224
+#: build/trans_presets.java:225
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -21928,5 +22124,5 @@
 #. </button>
 #. <button label="Unclassified" hotkey="4">
-#: build/trans_presets.java:240 build/trans_surveyor.java:84
+#: build/trans_presets.java:241 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -21936,5 +22132,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
 #. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
-#: build/trans_presets.java:244
+#: build/trans_presets.java:245
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -21944,6 +22140,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Dedicated Footway" check "Passing Places"
-#: build/trans_presets.java:255 build/trans_presets.java:333
-#: build/trans_presets.java:612 build/trans_presets.java:631
+#: build/trans_presets.java:256 build/trans_presets.java:334
+#: build/trans_presets.java:613 build/trans_presets.java:632
 msgid "Passing Places"
 msgstr ""
@@ -21970,15 +22166,15 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:296 build/trans_presets.java:315
-#: build/trans_presets.java:337 build/trans_presets.java:371
-#: build/trans_presets.java:392 build/trans_presets.java:440
-#: build/trans_presets.java:456 build/trans_presets.java:470
-#: build/trans_presets.java:496 build/trans_presets.java:526
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:590 build/trans_presets.java:614
-#: build/trans_presets.java:633 build/trans_presets.java:653
-#: build/trans_presets.java:1303 build/trans_presets.java:1579
-#: build/trans_presets.java:1624
+#: 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:527
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:591 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:654
+#: build/trans_presets.java:1310 build/trans_presets.java:1598
+#: build/trans_presets.java:1643
 msgid "Width (meters)"
 msgstr ""
@@ -21990,5 +22186,5 @@
 #. </button>
 #. <button label="Residential" hotkey="5">
-#: build/trans_presets.java:261 build/trans_surveyor.java:88
+#: build/trans_presets.java:262 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -21997,5 +22193,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
 #. item "Highways/Streets/Residential" label "Edit Residential Street"
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Edit Residential Street"
 msgstr ""
@@ -22017,178 +22213,179 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
 msgid "Surface"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301 build/trans_presets.java:2861
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308 build/trans_presets.java:2956
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301 build/trans_presets.java:2861
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308 build/trans_presets.java:2096
+#: build/trans_presets.java:2956
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:508
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:582 build/trans_presets.java:605
-#: build/trans_presets.java:625 build/trans_presets.java:645
-#: build/trans_presets.java:1301
+#: 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:509
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:583 build/trans_presets.java:606
+#: build/trans_presets.java:626 build/trans_presets.java:646
+#: build/trans_presets.java:1308
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:276 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:350 build/trans_presets.java:369
-#: build/trans_presets.java:389 build/trans_presets.java:484
-#: build/trans_presets.java:508 build/trans_presets.java:537
-#: build/trans_presets.java:558 build/trans_presets.java:582
-#: build/trans_presets.java:605 build/trans_presets.java:625
-#: build/trans_presets.java:645 build/trans_presets.java:1301
-#: build/trans_presets.java:2832
+#: 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:509 build/trans_presets.java:538
+#: build/trans_presets.java:559 build/trans_presets.java:583
+#: build/trans_presets.java:606 build/trans_presets.java:626
+#: build/trans_presets.java:646 build/trans_presets.java:1308
+#: build/trans_presets.java:2927
 msgid "ground"
 msgstr ""
@@ -22196,5 +22393,5 @@
 #. </optional>
 #. item "Highways/Streets/Living Street"
-#: build/trans_presets.java:280
+#: build/trans_presets.java:281
 msgid "Living Street"
 msgstr ""
@@ -22203,5 +22400,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:283
+#: build/trans_presets.java:284
 msgid "Edit Living Street"
 msgstr ""
@@ -22209,5 +22406,5 @@
 #. </optional>
 #. item "Highways/Streets/Pedestrian"
-#: build/trans_presets.java:299
+#: build/trans_presets.java:300
 msgid "Pedestrian"
 msgstr ""
@@ -22216,5 +22413,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
 #. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
-#: build/trans_presets.java:302
+#: build/trans_presets.java:303
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -22222,5 +22419,5 @@
 #. </optional>
 #. item "Highways/Streets/Service"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Service"
 msgstr ""
@@ -22229,5 +22426,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
 #. item "Highways/Streets/Service" label "Edit Serviceway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Edit Serviceway"
 msgstr ""
@@ -22237,17 +22434,17 @@
 #. <optional>
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Serviceway type"
 msgstr ""
 
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "parking_aisle"
 msgstr ""
@@ -22255,5 +22452,5 @@
 #. </optional>
 #. item "Highways/Streets/Parking Aisle"
-#: build/trans_presets.java:340
+#: build/trans_presets.java:341
 msgid "Parking Aisle"
 msgstr ""
@@ -22263,5 +22460,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:344
+#: build/trans_presets.java:345
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -22269,5 +22466,5 @@
 #. </optional>
 #. item "Highways/Streets/Road (Unknown Type)"
-#: build/trans_presets.java:354
+#: build/trans_presets.java:355
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -22276,5 +22473,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:357
+#: build/trans_presets.java:358
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -22282,15 +22479,15 @@
 #. </optional>
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:374
+#: build/trans_presets.java:375
 msgid "Construction"
 msgstr ""
 
 #. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
-#: build/trans_presets.java:375
+#: build/trans_presets.java:376
 msgid "Edit Highway Under Construction"
 msgstr ""
 
 #. item "Highways/Streets/Construction" combo "Junction"
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Junction"
 msgstr ""
@@ -22349,5 +22546,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:390 build/trans_style.java:984
+#: build/trans_presets.java:391 build/trans_style.java:984
 msgid "roundabout"
 msgstr ""
@@ -22356,5 +22553,5 @@
 #. <separator/>
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Road Restrictions"
 msgstr ""
@@ -22363,15 +22560,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:401
+#: build/trans_presets.java:402
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#: build/trans_presets.java:402
+#: build/trans_presets.java:403
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -22379,250 +22576,252 @@
 #. item "Highways/Streets/Road Restrictions" combo "Access"
 #. item "Ways/Track" combo "Access"
-#: build/trans_presets.java:403 build/trans_presets.java:493
+#: build/trans_presets.java:404 build/trans_presets.java:494
 msgid "Access"
 msgstr ""
 
-#: build/trans_presets.java:403 build/trans_presets.java:404
+#: 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:518
+#: build/trans_presets.java:519 build/trans_presets.java:520
+#: build/trans_presets.java:521 build/trans_presets.java:522
+#: build/trans_presets.java:523 build/trans_presets.java:524
+#: build/trans_presets.java:566 build/trans_presets.java:729
+#: build/trans_presets.java:1218 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:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1405
+#: build/trans_presets.java:1406 build/trans_presets.java:1407
+#: build/trans_presets.java:1422 build/trans_presets.java:1513
+#: build/trans_presets.java:1525 build/trans_presets.java:1526
+#: build/trans_presets.java:1527 build/trans_presets.java:1528
+#: build/trans_presets.java:1632 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1752
+#: build/trans_presets.java:1753 build/trans_presets.java:1754
+#: build/trans_presets.java:1755 build/trans_presets.java:1770
+#: build/trans_presets.java:1771 build/trans_presets.java:1772
+#: build/trans_presets.java:1773 build/trans_presets.java:1786
+#: build/trans_presets.java:1787 build/trans_presets.java:1788
+#: build/trans_presets.java:1789 build/trans_presets.java:1803
+#: build/trans_presets.java:1804 build/trans_presets.java:1805
+#: build/trans_presets.java:1806 build/trans_presets.java:1821
+#: build/trans_presets.java:1822 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1838
+#: build/trans_presets.java:1839 build/trans_presets.java:1840
+#: build/trans_presets.java:1841 build/trans_presets.java:1855
+#: build/trans_presets.java:1856 build/trans_presets.java:1857
+#: build/trans_presets.java:1858 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1900 build/trans_presets.java:1901
+#: build/trans_presets.java:1902 build/trans_presets.java:1903
+#: build/trans_presets.java:1919 build/trans_presets.java:1920
+#: build/trans_presets.java:1921 build/trans_presets.java:1922
+#: build/trans_presets.java:1936 build/trans_presets.java:1937
+#: build/trans_presets.java:1938 build/trans_presets.java:1939
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1957 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1975
+#: build/trans_presets.java:1976 build/trans_presets.java:1977
+#: build/trans_presets.java:1990 build/trans_presets.java:1991
+#: build/trans_presets.java:1992 build/trans_presets.java:1993
+#: build/trans_presets.java:2007 build/trans_presets.java:2008
+#: build/trans_presets.java:2009 build/trans_presets.java:2010
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2095 build/trans_presets.java:2158
+#: build/trans_presets.java:2168 build/trans_presets.java:2270
+#: build/trans_presets.java:2820 build/trans_presets.java:2898
+#: build/trans_presets.java:2899 build/trans_presets.java:2955
+#: build/trans_presets.java:2964 build/trans_presets.java:2965
+#: build/trans_presets.java:2966 build/trans_presets.java:3440
+msgid "yes"
+msgstr ""
+
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#. 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:2270 build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#. 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_style.java:219
+msgid "destination"
+msgstr ""
+
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#. 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:2270
+#: build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: 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
+msgid "agricultural"
+msgstr ""
+
+#: 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
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:404 build/trans_presets.java:405
+#: 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
+msgid "delivery"
+msgstr ""
+
+#: 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:511
+#: build/trans_presets.java:518 build/trans_presets.java:519
+#: build/trans_presets.java:520 build/trans_presets.java:521
+#: build/trans_presets.java:522 build/trans_presets.java:523
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:698 build/trans_presets.java:720
+#: build/trans_presets.java:1218 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:1332
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1405 build/trans_presets.java:1406
+#: build/trans_presets.java:1407 build/trans_presets.java:1422
+#: build/trans_presets.java:1513 build/trans_presets.java:1525
+#: build/trans_presets.java:1526 build/trans_presets.java:1527
+#: build/trans_presets.java:1528 build/trans_presets.java:1632
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1752 build/trans_presets.java:1753
+#: build/trans_presets.java:1754 build/trans_presets.java:1755
+#: build/trans_presets.java:1770 build/trans_presets.java:1771
+#: build/trans_presets.java:1772 build/trans_presets.java:1773
+#: build/trans_presets.java:1786 build/trans_presets.java:1787
+#: build/trans_presets.java:1788 build/trans_presets.java:1789
+#: build/trans_presets.java:1803 build/trans_presets.java:1804
+#: build/trans_presets.java:1805 build/trans_presets.java:1806
+#: build/trans_presets.java:1821 build/trans_presets.java:1822
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1838 build/trans_presets.java:1839
+#: build/trans_presets.java:1840 build/trans_presets.java:1841
+#: build/trans_presets.java:1855 build/trans_presets.java:1856
+#: build/trans_presets.java:1857 build/trans_presets.java:1858
+#: build/trans_presets.java:1861 build/trans_presets.java:1877
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1900
+#: build/trans_presets.java:1901 build/trans_presets.java:1902
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1920 build/trans_presets.java:1921
+#: build/trans_presets.java:1922 build/trans_presets.java:1936
+#: build/trans_presets.java:1937 build/trans_presets.java:1938
+#: build/trans_presets.java:1939 build/trans_presets.java:1955
+#: build/trans_presets.java:1956 build/trans_presets.java:1957
+#: build/trans_presets.java:1958 build/trans_presets.java:1974
+#: build/trans_presets.java:1975 build/trans_presets.java:1976
+#: build/trans_presets.java:1977 build/trans_presets.java:1990
+#: build/trans_presets.java:1991 build/trans_presets.java:1992
+#: build/trans_presets.java:1993 build/trans_presets.java:2007
+#: build/trans_presets.java:2008 build/trans_presets.java:2009
+#: build/trans_presets.java:2010 build/trans_presets.java:2024
+#: build/trans_presets.java:2025 build/trans_presets.java:2095
+#: build/trans_presets.java:2158 build/trans_presets.java:2168
+#: build/trans_presets.java:2820 build/trans_presets.java:2898
+#: build/trans_presets.java:2899 build/trans_presets.java:2955
+#: build/trans_presets.java:2964 build/trans_presets.java:2965
+#: build/trans_presets.java:2966 build/trans_presets.java:3440
+msgid "no"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
+#: build/trans_presets.java:405
+msgid "Agricultural"
+msgstr ""
+
 #: 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:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:517
+#: build/trans_presets.java:413 build/trans_presets.java:494
+#: build/trans_presets.java:495 build/trans_presets.java:496
 #: build/trans_presets.java:518 build/trans_presets.java:519
-#: build/trans_presets.java:520 build/trans_presets.java:521
-#: build/trans_presets.java:522 build/trans_presets.java:523
-#: build/trans_presets.java:565 build/trans_presets.java:728
-#: build/trans_presets.java:1211 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:1397
-#: build/trans_presets.java:1423 build/trans_presets.java:1424
-#: build/trans_presets.java:1427 build/trans_presets.java:1428
-#: build/trans_presets.java:1429 build/trans_presets.java:1495
-#: build/trans_presets.java:1506 build/trans_presets.java:1507
-#: build/trans_presets.java:1508 build/trans_presets.java:1509
-#: build/trans_presets.java:1510 build/trans_presets.java:1613
-#: build/trans_presets.java:1614 build/trans_presets.java:1615
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1722
-#: build/trans_presets.java:1737 build/trans_presets.java:1738
-#: build/trans_presets.java:1739 build/trans_presets.java:1740
-#: build/trans_presets.java:1753 build/trans_presets.java:1754
-#: build/trans_presets.java:1755 build/trans_presets.java:1756
-#: build/trans_presets.java:1770 build/trans_presets.java:1771
-#: build/trans_presets.java:1772 build/trans_presets.java:1773
-#: build/trans_presets.java:1788 build/trans_presets.java:1789
-#: build/trans_presets.java:1790 build/trans_presets.java:1791
-#: build/trans_presets.java:1805 build/trans_presets.java:1806
-#: build/trans_presets.java:1807 build/trans_presets.java:1808
-#: build/trans_presets.java:1822 build/trans_presets.java:1823
-#: build/trans_presets.java:1824 build/trans_presets.java:1825
-#: build/trans_presets.java:1828 build/trans_presets.java:1844
-#: build/trans_presets.java:1845 build/trans_presets.java:1846
-#: build/trans_presets.java:1847 build/trans_presets.java:1867
-#: build/trans_presets.java:1868 build/trans_presets.java:1869
-#: build/trans_presets.java:1870 build/trans_presets.java:1886
-#: build/trans_presets.java:1887 build/trans_presets.java:1888
-#: build/trans_presets.java:1889 build/trans_presets.java:1903
-#: build/trans_presets.java:1904 build/trans_presets.java:1905
-#: build/trans_presets.java:1906 build/trans_presets.java:1922
-#: build/trans_presets.java:1923 build/trans_presets.java:1924
-#: build/trans_presets.java:1925 build/trans_presets.java:1941
-#: build/trans_presets.java:1942 build/trans_presets.java:1943
-#: build/trans_presets.java:1944 build/trans_presets.java:1957
-#: build/trans_presets.java:1958 build/trans_presets.java:1959
-#: build/trans_presets.java:1960 build/trans_presets.java:1974
-#: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1977 build/trans_presets.java:1991
-#: build/trans_presets.java:1992 build/trans_presets.java:2116
-#: build/trans_presets.java:2126 build/trans_presets.java:2803
-#: build/trans_presets.java:2804 build/trans_presets.java:2860
-#: build/trans_presets.java:2869 build/trans_presets.java:2870
-#: build/trans_presets.java:2871 build/trans_presets.java:3157
-msgid "yes"
-msgstr ""
-
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#. color private
-#: build/trans_presets.java:403 build/trans_presets.java:405
+#: build/trans_presets.java:520 build/trans_presets.java:522
+#: build/trans_presets.java:523 build/trans_presets.java:524
+msgid "designated"
+msgstr ""
+
 #: 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:493
+#: build/trans_presets.java:412 build/trans_presets.java:413
 #: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#. color destination
-#: build/trans_presets.java:403 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:410 build/trans_presets.java:411
-#: build/trans_presets.java:412 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#. color permissive
-#: build/trans_presets.java:403 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:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:403 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:410
-#: build/trans_presets.java:411 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-msgid "agricultural"
-msgstr ""
-
-#: build/trans_presets.java:403 build/trans_presets.java:407
-#: build/trans_presets.java:408 build/trans_presets.java:410
-#: build/trans_presets.java:411 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:403 build/trans_presets.java:404
-#: build/trans_presets.java:407 build/trans_presets.java:408
-#: build/trans_presets.java:410 build/trans_presets.java:411
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495
-msgid "delivery"
-msgstr ""
-
-#: build/trans_presets.java:403 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:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:510
-#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:496 build/trans_presets.java:518
 #: build/trans_presets.java:519 build/trans_presets.java:520
-#: build/trans_presets.java:521 build/trans_presets.java:522
-#: build/trans_presets.java:523 build/trans_presets.java:565
-#: build/trans_presets.java:697 build/trans_presets.java:719
-#: build/trans_presets.java:1211 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:1325
-#: build/trans_presets.java:1397 build/trans_presets.java:1423
-#: build/trans_presets.java:1424 build/trans_presets.java:1427
-#: build/trans_presets.java:1428 build/trans_presets.java:1429
-#: build/trans_presets.java:1495 build/trans_presets.java:1506
-#: build/trans_presets.java:1507 build/trans_presets.java:1508
-#: build/trans_presets.java:1509 build/trans_presets.java:1510
-#: build/trans_presets.java:1613 build/trans_presets.java:1614
-#: build/trans_presets.java:1615 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1722 build/trans_presets.java:1737
-#: build/trans_presets.java:1738 build/trans_presets.java:1739
-#: build/trans_presets.java:1740 build/trans_presets.java:1753
-#: build/trans_presets.java:1754 build/trans_presets.java:1755
-#: build/trans_presets.java:1756 build/trans_presets.java:1770
-#: build/trans_presets.java:1771 build/trans_presets.java:1772
-#: build/trans_presets.java:1773 build/trans_presets.java:1788
-#: build/trans_presets.java:1789 build/trans_presets.java:1790
-#: build/trans_presets.java:1791 build/trans_presets.java:1805
-#: build/trans_presets.java:1806 build/trans_presets.java:1807
-#: build/trans_presets.java:1808 build/trans_presets.java:1822
-#: build/trans_presets.java:1823 build/trans_presets.java:1824
-#: build/trans_presets.java:1825 build/trans_presets.java:1828
-#: build/trans_presets.java:1844 build/trans_presets.java:1845
-#: build/trans_presets.java:1846 build/trans_presets.java:1847
-#: build/trans_presets.java:1867 build/trans_presets.java:1868
-#: build/trans_presets.java:1869 build/trans_presets.java:1870
-#: build/trans_presets.java:1886 build/trans_presets.java:1887
-#: build/trans_presets.java:1888 build/trans_presets.java:1889
-#: build/trans_presets.java:1903 build/trans_presets.java:1904
-#: build/trans_presets.java:1905 build/trans_presets.java:1906
-#: build/trans_presets.java:1922 build/trans_presets.java:1923
-#: build/trans_presets.java:1924 build/trans_presets.java:1925
-#: build/trans_presets.java:1941 build/trans_presets.java:1942
-#: build/trans_presets.java:1943 build/trans_presets.java:1944
-#: build/trans_presets.java:1957 build/trans_presets.java:1958
-#: build/trans_presets.java:1959 build/trans_presets.java:1960
-#: build/trans_presets.java:1974 build/trans_presets.java:1975
-#: build/trans_presets.java:1976 build/trans_presets.java:1977
-#: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:2116 build/trans_presets.java:2126
-#: build/trans_presets.java:2803 build/trans_presets.java:2804
-#: build/trans_presets.java:2860 build/trans_presets.java:2869
-#: build/trans_presets.java:2870 build/trans_presets.java:2871
-#: build/trans_presets.java:3157
-msgid "no"
-msgstr ""
-
-#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#: build/trans_presets.java:404
-msgid "Agricultural"
-msgstr ""
-
-#: 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:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:519 build/trans_presets.java:521
 #: build/trans_presets.java:522 build/trans_presets.java:523
-msgid "designated"
-msgstr ""
-
-#: 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:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:517
-#: build/trans_presets.java:518 build/trans_presets.java:519
-#: build/trans_presets.java:521 build/trans_presets.java:522
 msgid "official"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Goods"
-#: build/trans_presets.java:407
+#: build/trans_presets.java:408
 msgid "Goods"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#: build/trans_presets.java:408
+#: build/trans_presets.java:409
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22639,10 +22838,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:409 build/trans_presets.java:519
-#: build/trans_presets.java:797 build/trans_presets.java:830
-#: build/trans_presets.java:852 build/trans_presets.java:889
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:926 build/trans_presets.java:938
-#: build/trans_presets.java:978
+#: build/trans_presets.java:410 build/trans_presets.java:520
+#: build/trans_presets.java:798 build/trans_presets.java:831
+#: build/trans_presets.java:853 build/trans_presets.java:890
+#: build/trans_presets.java:903 build/trans_presets.java:915
+#: build/trans_presets.java:927 build/trans_presets.java:939
+#: build/trans_presets.java:979
 msgid "Horse"
 msgstr ""
@@ -22661,11 +22860,11 @@
 #. item "Barriers/Sally Port" check "Motorcycle"
 #. group "Motorcycle"
-#: build/trans_presets.java:410 build/trans_presets.java:494
-#: build/trans_presets.java:798 build/trans_presets.java:816
-#: build/trans_presets.java:831 build/trans_presets.java:853
-#: build/trans_presets.java:890 build/trans_presets.java:903
-#: build/trans_presets.java:915 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:979
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:411 build/trans_presets.java:495
+#: build/trans_presets.java:799 build/trans_presets.java:817
+#: build/trans_presets.java:832 build/trans_presets.java:854
+#: build/trans_presets.java:891 build/trans_presets.java:904
+#: build/trans_presets.java:916 build/trans_presets.java:928
+#: build/trans_presets.java:940 build/trans_presets.java:980
+#: build/trans_presets.java:1506
 msgid "Motorcycle"
 msgstr ""
@@ -22683,20 +22882,20 @@
 #. item "Barriers/Bump Gate" check "Motorcar"
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:411 build/trans_presets.java:495
-#: build/trans_presets.java:523 build/trans_presets.java:817
-#: build/trans_presets.java:832 build/trans_presets.java:854
-#: build/trans_presets.java:891 build/trans_presets.java:904
-#: build/trans_presets.java:916 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:980
+#: build/trans_presets.java:412 build/trans_presets.java:496
+#: build/trans_presets.java:524 build/trans_presets.java:818
+#: 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:981
 msgid "Motorcar"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#: build/trans_presets.java:412
+#: build/trans_presets.java:413
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#: build/trans_presets.java:414
+#: build/trans_presets.java:415
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -22704,25 +22903,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#: build/trans_presets.java:415 build/trans_presets.java:455
+#: build/trans_presets.java:416 build/trans_presets.java:456
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
-#: build/trans_presets.java:416
+#: build/trans_presets.java:417
 msgid "Max. axleload (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:418
+#: build/trans_presets.java:419
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22730,5 +22929,5 @@
 #. <separator/>
 #. item "Highways/Streets/Roundabout"
-#: build/trans_presets.java:422
+#: build/trans_presets.java:423
 msgid "Roundabout"
 msgstr ""
@@ -22739,5 +22938,5 @@
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
-#: build/trans_presets.java:427
+#: build/trans_presets.java:428
 msgid "Edit Junction"
 msgstr ""
@@ -22756,10 +22955,10 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:430 build/trans_style.java:553
+#: build/trans_presets.java:431 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:430
+#: build/trans_presets.java:431
 msgid "motorway_link"
 msgstr ""
@@ -22781,10 +22980,10 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:430 build/trans_style.java:569
+#: build/trans_presets.java:431 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:430
+#: build/trans_presets.java:431
 msgid "trunk_link"
 msgstr ""
@@ -22806,10 +23005,10 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:430 build/trans_style.java:585
+#: build/trans_presets.java:431 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:430
+#: build/trans_presets.java:431
 msgid "primary_link"
 msgstr ""
@@ -22831,5 +23030,5 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:430 build/trans_style.java:601
+#: build/trans_presets.java:431 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22844,9 +23043,9 @@
 #. <condition k="highway" v="tertiary"/>
 #. color tertiary
-#: build/trans_presets.java:430 build/trans_style.java:617
+#: build/trans_presets.java:431 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:430
+#: build/trans_presets.java:431
 msgid "unclassified"
 msgstr ""
@@ -22860,9 +23059,9 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:430 build/trans_style.java:3378
+#: build/trans_presets.java:431 build/trans_style.java:3562
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:430
+#: build/trans_presets.java:431
 msgid "living_street"
 msgstr ""
@@ -22882,5 +23081,5 @@
 #. <rule>
 #. <condition k="fixme"/>
-#. <icon annotate="true" src="fixme.png" priority="-10000"/>
+#. <icon annotate="true" src="misc/fixme.png" priority="10000"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22889,5 +23088,5 @@
 #. <rule>
 #. <condition k="FIXME"/>
-#. <icon annotate="true" src="fixme.png" priority="-10000"/>
+#. <icon annotate="true" src="misc/fixme.png" priority="10000"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22897,5 +23096,5 @@
 #. <rule>
 #. <condition k="public_transport" v="stop_position"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22904,12 +23103,12 @@
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:430 build/trans_style.java:673
-#: build/trans_style.java:4569
+#: build/trans_presets.java:431 build/trans_style.java:673
+#: build/trans_style.java:4753
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:430
+#: build/trans_presets.java:431
 msgid "bus_guideway"
 msgstr ""
@@ -22938,6 +23137,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:430 build/trans_style.java:922
-#: build/trans_style.java:3443 build/trans_style.java:3444
+#: build/trans_presets.java:431 build/trans_style.java:922
+#: build/trans_style.java:3627 build/trans_style.java:3628
 msgid "construction"
 msgstr ""
@@ -22948,10 +23147,10 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
-#: build/trans_presets.java:448
+#: build/trans_presets.java:449
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel" label "Edit Tunnel"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:461
 msgid "Edit Tunnel"
 msgstr ""
@@ -22959,10 +23158,10 @@
 #. </optional>
 #. group "Ways"
-#: build/trans_presets.java:474
+#: build/trans_presets.java:475
 msgid "Ways"
 msgstr ""
 
 #. item "Ways/Track"
-#: build/trans_presets.java:475
+#: build/trans_presets.java:476
 msgid "Track"
 msgstr ""
@@ -22971,30 +23170,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:478
+#: build/trans_presets.java:479
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:483
+#: build/trans_presets.java:484
 msgid "Tracktype"
 msgstr ""
 
-#: build/trans_presets.java:483
+#: build/trans_presets.java:484
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:483
+#: build/trans_presets.java:484
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:483
+#: build/trans_presets.java:484
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:483
+#: build/trans_presets.java:484
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:483
+#: build/trans_presets.java:484
 msgid "grade5"
 msgstr ""
@@ -23002,5 +23201,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:485 build/trans_presets.java:509
+#: build/trans_presets.java:486 build/trans_presets.java:510
 msgid "MTB Scale"
 msgstr ""
@@ -23008,5 +23207,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:499
+#: build/trans_presets.java:500
 msgid "Path"
 msgstr ""
@@ -23015,54 +23214,54 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
 #. item "Ways/Path" label "Edit Path"
-#: build/trans_presets.java:502
+#: build/trans_presets.java:503
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:507
+#: build/trans_presets.java:508
 msgid "SAC Scale"
 msgstr ""
 
-#: build/trans_presets.java:507 build/trans_presets.java:3668
+#: build/trans_presets.java:508 build/trans_presets.java:3951
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:507
+#: build/trans_presets.java:508
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:507
+#: build/trans_presets.java:508
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:507
+#: build/trans_presets.java:508
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:507
+#: build/trans_presets.java:508
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:507
+#: build/trans_presets.java:508
 msgid "difficult_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:510
+#: build/trans_presets.java:511
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:510
+#: build/trans_presets.java:511
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:510 build/trans_presets.java:2362
+#: build/trans_presets.java:511 build/trans_presets.java:2416
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:510
+#: build/trans_presets.java:511
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:510
+#: build/trans_presets.java:511
 msgid "horrible"
 msgstr ""
@@ -23085,23 +23284,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:520 build/trans_presets.java:1722
-#: build/trans_presets.java:1740 build/trans_presets.java:1756
-#: build/trans_presets.java:1773 build/trans_presets.java:1791
-#: build/trans_presets.java:1808 build/trans_presets.java:1825
-#: build/trans_presets.java:1847 build/trans_presets.java:1870
-#: build/trans_presets.java:1889 build/trans_presets.java:1906
-#: build/trans_presets.java:1925 build/trans_presets.java:1944
-#: build/trans_presets.java:1960 build/trans_presets.java:1977
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:521 build/trans_presets.java:1755
+#: build/trans_presets.java:1773 build/trans_presets.java:1789
+#: build/trans_presets.java:1806 build/trans_presets.java:1824
+#: build/trans_presets.java:1841 build/trans_presets.java:1858
+#: build/trans_presets.java:1880 build/trans_presets.java:1903
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1958 build/trans_presets.java:1977
+#: build/trans_presets.java:1993 build/trans_presets.java:2010
+#: build/trans_presets.java:2025
 msgid "Wheelchairs"
 msgstr ""
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:521
+#: build/trans_presets.java:522
 msgid "Ski"
 msgstr ""
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:522
+#: build/trans_presets.java:523
 msgid "Snowmobile"
 msgstr ""
@@ -23110,5 +23309,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:530
+#: build/trans_presets.java:531
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -23116,5 +23315,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
-#: build/trans_presets.java:532
+#: build/trans_presets.java:533
 msgid "Edit Bridleway"
 msgstr ""
@@ -23122,5 +23321,5 @@
 #. </optional>
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:549
+#: build/trans_presets.java:550
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -23138,11 +23337,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:553 build/trans_presets.java:574
-#: build/trans_presets.java:597
+#: build/trans_presets.java:554 build/trans_presets.java:575
+#: build/trans_presets.java:598
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:565
+#: build/trans_presets.java:566
 msgid "Pedestrians"
 msgstr ""
@@ -23150,5 +23349,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:570
+#: build/trans_presets.java:571
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -23156,5 +23355,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:593
+#: build/trans_presets.java:594
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -23162,5 +23361,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:617
+#: build/trans_presets.java:618
 msgid "Dedicated Footway"
 msgstr ""
@@ -23169,5 +23368,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:620
+#: build/trans_presets.java:621
 msgid "Edit Footway"
 msgstr ""
@@ -23175,5 +23374,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "Steps"
 msgstr ""
@@ -23183,15 +23382,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:641
 msgid "Edit Flight of Steps"
 msgstr ""
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "Amount of Steps"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:659
+#: build/trans_presets.java:660
 msgid "Motorway Junction"
 msgstr ""
@@ -23199,15 +23398,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:661
+#: build/trans_presets.java:662
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:666
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:667
+#: build/trans_presets.java:668
 msgid "Services"
 msgstr ""
@@ -23215,5 +23414,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:669
+#: build/trans_presets.java:670
 msgid "Edit Service Station"
 msgstr ""
@@ -23222,4 +23421,6 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. item "Car/Fuel" text "Operator"
+#. <key key="amenity" value="charging_station" />
+#. item "Car/Charging Station" text "Operator"
 #. item "Car/Wash" text "Operator"
 #. item "Car/Car Dealer" text "Operator"
@@ -23229,4 +23430,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Motorcycle/Motorcycle Dealer" text "Operator"
+#. item "Public Transport/Ticket Machine" text "Operator"
 #. item "Travel/Accomodation/Hotel" text "Operator"
 #. item "Travel/Accomodation/Motel" text "Operator"
@@ -23239,6 +23441,10 @@
 #. item "Tourism/Information Terminal" text "Operator"
 #. item "Tourism/Audioguide" text "Operator"
+#. item "Leisure/Sauna" text "Operator"
 #. item "Man-Made/Buildings/Post Office" text "Operator"
+#. item "Man-Made/Buildings/Studio" text "Operator"
+#. item "Man-Made/Buildings/Driving School" text "Operator"
 #. item "Man Made/Tower" text "Operator"
+#. item "Man Made/Chimney" text "Operator"
 #. <key key="man_made" value="pipeline" />
 #. item "Man Made/Pipeline" text "Operator"
@@ -23257,4 +23463,24 @@
 #. <key key="amenity" value="telephone" />
 #. item "Amenities/Telephone" text "Operator"
+#. item "Food/Seafood" text "Operator"
+#. item "Food/Deli (Fine Food)" text "Operator"
+#. item "Food/Marketplace" text "Operator"
+#. item "Food/Greengrocer" text "Operator"
+#. item "Shops/Hearing Aids" text "Operator"
+#. item "Shops/Jewelry" text "Operator"
+#. item "Shops/Erotic" text "Operator"
+#. item "Shops/Department Store" text "Operator"
+#. item "Shops/Mall" text "Operator"
+#. item "Shops/Boutique" text "Operator"
+#. item "Shops/Fabric" text "Operator"
+#. item "Shops/Mobile Phone" text "Operator"
+#. item "Shops/Vacuum Cleaner" text "Operator"
+#. item "Shops/Paint" text "Operator"
+#. item "Shops/Kitchen" text "Operator"
+#. item "Shops/Curtain" text "Operator"
+#. item "Shops/Frame" text "Operator"
+#. item "Shops/Copyshop" text "Operator"
+#. item "Shops/Musical Instrument" text "Operator"
+#. item "Shops/Variety Store" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
 #. item "Cash/Bank" text "Operator"
@@ -23266,23 +23492,36 @@
 #. item "Relations/Route" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:674 build/trans_presets.java:841
-#: build/trans_presets.java:1395 build/trans_presets.java:1437
-#: build/trans_presets.java:1445 build/trans_presets.java:1452
-#: build/trans_presets.java:1460 build/trans_presets.java:1475
-#: build/trans_presets.java:1484 build/trans_presets.java:1503
-#: build/trans_presets.java:1716 build/trans_presets.java:1734
-#: build/trans_presets.java:1785 build/trans_presets.java:1802
-#: build/trans_presets.java:1861 build/trans_presets.java:1882
-#: build/trans_presets.java:1918 build/trans_presets.java:1937
-#: build/trans_presets.java:2114 build/trans_presets.java:2124
-#: build/trans_presets.java:2592 build/trans_presets.java:2672
-#: build/trans_presets.java:2702 build/trans_presets.java:2726
-#: build/trans_presets.java:2763 build/trans_presets.java:2771
-#: build/trans_presets.java:2788 build/trans_presets.java:2801
-#: build/trans_presets.java:2810 build/trans_presets.java:2817
-#: build/trans_presets.java:3104 build/trans_presets.java:3121
-#: build/trans_presets.java:3136 build/trans_presets.java:3171
-#: build/trans_presets.java:3182 build/trans_presets.java:3675
-#: build/trans_presets.java:3695
+#: build/trans_presets.java:675 build/trans_presets.java:842
+#: build/trans_presets.java:1420 build/trans_presets.java:1444
+#: build/trans_presets.java:1453 build/trans_presets.java:1462
+#: build/trans_presets.java:1469 build/trans_presets.java:1477
+#: build/trans_presets.java:1493 build/trans_presets.java:1502
+#: build/trans_presets.java:1521 build/trans_presets.java:1652
+#: build/trans_presets.java:1749 build/trans_presets.java:1767
+#: build/trans_presets.java:1818 build/trans_presets.java:1835
+#: build/trans_presets.java:1894 build/trans_presets.java:1915
+#: build/trans_presets.java:1951 build/trans_presets.java:1970
+#: build/trans_presets.java:2156 build/trans_presets.java:2166
+#: build/trans_presets.java:2268 build/trans_presets.java:2646
+#: build/trans_presets.java:2654 build/trans_presets.java:2689
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2792 build/trans_presets.java:2818
+#: build/trans_presets.java:2858 build/trans_presets.java:2866
+#: build/trans_presets.java:2883 build/trans_presets.java:2896
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:3037 build/trans_presets.java:3046
+#: build/trans_presets.java:3055 build/trans_presets.java:3064
+#: build/trans_presets.java:3112 build/trans_presets.java:3121
+#: build/trans_presets.java:3130 build/trans_presets.java:3140
+#: build/trans_presets.java:3149 build/trans_presets.java:3165
+#: build/trans_presets.java:3213 build/trans_presets.java:3235
+#: build/trans_presets.java:3244 build/trans_presets.java:3287
+#: build/trans_presets.java:3309 build/trans_presets.java:3318
+#: build/trans_presets.java:3327 build/trans_presets.java:3342
+#: build/trans_presets.java:3363 build/trans_presets.java:3378
+#: build/trans_presets.java:3387 build/trans_presets.java:3404
+#: build/trans_presets.java:3419 build/trans_presets.java:3454
+#: build/trans_presets.java:3465 build/trans_presets.java:3958
+#: build/trans_presets.java:3978
 msgid "Operator"
 msgstr ""
@@ -23291,5 +23530,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:678
+#: build/trans_presets.java:679
 msgid "Rest Area"
 msgstr ""
@@ -23297,5 +23536,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:680
+#: build/trans_presets.java:681
 msgid "Edit Rest Area"
 msgstr ""
@@ -23304,5 +23543,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:689
 msgid "Emergency Phone"
 msgstr ""
@@ -23312,5 +23551,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:693
+#: build/trans_presets.java:694
 msgid "Traffic Signal"
 msgstr ""
@@ -23320,25 +23559,25 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:697
+#: build/trans_presets.java:698
 msgid "Pedestrian crossing type"
 msgstr ""
 
-#: build/trans_presets.java:697 build/trans_presets.java:719
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:698 build/trans_presets.java:720
+#: build/trans_presets.java:1332
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:697 build/trans_presets.java:719
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:698 build/trans_presets.java:720
+#: build/trans_presets.java:1332
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:697 build/trans_presets.java:719
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:698 build/trans_presets.java:720
+#: build/trans_presets.java:1332
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:697 build/trans_presets.java:719
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:698 build/trans_presets.java:720
+#: build/trans_presets.java:1332
 msgid "unmarked"
 msgstr ""
@@ -23347,6 +23586,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:698 build/trans_presets.java:721
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:699 build/trans_presets.java:722
+#: build/trans_presets.java:1333
 msgid "Cross on horseback"
 msgstr ""
@@ -23355,6 +23594,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:699 build/trans_presets.java:720
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:700 build/trans_presets.java:721
+#: build/trans_presets.java:1334
 msgid "Cross by bicycle"
 msgstr ""
@@ -23363,35 +23602,35 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:700 build/trans_presets.java:722
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:701 build/trans_presets.java:723
+#: build/trans_presets.java:1335
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:702
 msgid "Crossing type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:701 build/trans_presets.java:723
+#: build/trans_presets.java:702 build/trans_presets.java:724
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:701 build/trans_presets.java:723
+#: build/trans_presets.java:702 build/trans_presets.java:724
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:701 build/trans_presets.java:723
+#: build/trans_presets.java:702 build/trans_presets.java:724
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:701 build/trans_presets.java:723
+#: build/trans_presets.java:702 build/trans_presets.java:724
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:701 build/trans_presets.java:723
+#: build/trans_presets.java:702 build/trans_presets.java:724
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:701 build/trans_presets.java:723
+#: build/trans_presets.java:702 build/trans_presets.java:724
 msgid "tiger"
 msgstr ""
@@ -23399,5 +23638,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:705
 msgid "Stop"
 msgstr ""
@@ -23405,5 +23644,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:708
 msgid "Mini-roundabout"
 msgstr ""
@@ -23414,14 +23653,14 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:712
+#: build/trans_presets.java:713
 msgid "Direction"
 msgstr ""
 
-#: build/trans_presets.java:712
+#: build/trans_presets.java:713
 msgid "clockwise"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:714
+#: build/trans_presets.java:715
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -23430,15 +23669,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:717
+#: build/trans_presets.java:718
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:724
 msgid "Type name (UK)"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:726
 msgid "Traffic Calming"
 msgstr ""
@@ -23446,34 +23685,34 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:727
+#: build/trans_presets.java:728
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:728
+#: build/trans_presets.java:729
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:728
+#: build/trans_presets.java:729
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:728
+#: build/trans_presets.java:729
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:728
+#: build/trans_presets.java:729
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:728
+#: build/trans_presets.java:729
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:728
+#: build/trans_presets.java:729
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:730
+#: build/trans_presets.java:731
 msgid "Passing Place"
 msgstr ""
@@ -23481,5 +23720,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:732
+#: build/trans_presets.java:733
 msgid "Edit Passing Place"
 msgstr ""
@@ -23487,5 +23726,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Turning Circle"
 msgstr ""
@@ -23495,5 +23734,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:740
+#: build/trans_presets.java:741
 msgid "City Limit"
 msgstr ""
@@ -23501,15 +23740,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:742
+#: build/trans_presets.java:743
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:747
+#: build/trans_presets.java:748
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Speed Camera"
 msgstr ""
@@ -23519,5 +23758,5 @@
 #. <separator/>
 #. item "Waypoints/Incline"
-#: build/trans_presets.java:754
+#: build/trans_presets.java:755
 msgid "Incline"
 msgstr ""
@@ -23525,5 +23764,5 @@
 #. <key key="highway" value="incline" />
 #. item "Waypoints/Incline Steep"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:758
 msgid "Incline Steep"
 msgstr ""
@@ -23531,5 +23770,5 @@
 #. <key key="highway" value="incline_steep" />
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Grit Bin"
 msgstr ""
@@ -23539,10 +23778,10 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:765
+#: build/trans_presets.java:766
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:766
+#: build/trans_presets.java:767
 msgid "Edit Ford"
 msgstr ""
@@ -23550,5 +23789,5 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Mountain Pass"
 msgstr ""
@@ -23556,5 +23795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:776
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -23566,7 +23805,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:780 build/trans_presets.java:1803
-#: build/trans_presets.java:2094 build/trans_presets.java:3320
-#: build/trans_presets.java:3328 build/trans_presets.java:3336
+#: build/trans_presets.java:781 build/trans_presets.java:1836
+#: build/trans_presets.java:2136 build/trans_presets.java:3603
+#: build/trans_presets.java:3611 build/trans_presets.java:3619
 msgid "Elevation"
 msgstr ""
@@ -23600,18 +23839,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:781 build/trans_presets.java:1019
-#: build/trans_presets.java:1030 build/trans_presets.java:1044
-#: build/trans_presets.java:1059 build/trans_presets.java:1645
-#: build/trans_presets.java:2013 build/trans_presets.java:2022
-#: build/trans_presets.java:2145 build/trans_presets.java:3236
-#: build/trans_presets.java:3243 build/trans_presets.java:3250
-#: build/trans_presets.java:3257 build/trans_presets.java:3264
-#: build/trans_presets.java:3272 build/trans_presets.java:3280
-#: build/trans_presets.java:3288 build/trans_presets.java:3295
-#: build/trans_presets.java:3302 build/trans_presets.java:3311
-#: build/trans_presets.java:3321 build/trans_presets.java:3329
-#: build/trans_presets.java:3337 build/trans_presets.java:3344
-#: build/trans_presets.java:3353 build/trans_presets.java:3361
-#: build/trans_presets.java:3610
+#: build/trans_presets.java:782 build/trans_presets.java:1020
+#: build/trans_presets.java:1031 build/trans_presets.java:1045
+#: build/trans_presets.java:1060 build/trans_presets.java:1678
+#: build/trans_presets.java:2046 build/trans_presets.java:2055
+#: build/trans_presets.java:2187 build/trans_presets.java:3519
+#: build/trans_presets.java:3526 build/trans_presets.java:3533
+#: build/trans_presets.java:3540 build/trans_presets.java:3547
+#: build/trans_presets.java:3555 build/trans_presets.java:3563
+#: build/trans_presets.java:3571 build/trans_presets.java:3578
+#: build/trans_presets.java:3585 build/trans_presets.java:3594
+#: build/trans_presets.java:3604 build/trans_presets.java:3612
+#: build/trans_presets.java:3620 build/trans_presets.java:3627
+#: build/trans_presets.java:3636 build/trans_presets.java:3644
+#: build/trans_presets.java:3893
 msgid "Wikipedia"
 msgstr ""
@@ -23619,5 +23858,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:786
 msgid "Barriers"
 msgstr ""
@@ -23625,5 +23864,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:788
+#: build/trans_presets.java:789
 msgid "Bollard"
 msgstr ""
@@ -23631,5 +23870,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:791
 msgid "Edit Bollard"
 msgstr ""
@@ -23674,16 +23913,16 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:793 build/trans_presets.java:812
-#: build/trans_presets.java:826 build/trans_presets.java:848
-#: build/trans_presets.java:885 build/trans_presets.java:898
-#: build/trans_presets.java:910 build/trans_presets.java:922
-#: build/trans_presets.java:934 build/trans_presets.java:946
-#: build/trans_presets.java:956 build/trans_presets.java:965
-#: build/trans_presets.java:974
+#: build/trans_presets.java:794 build/trans_presets.java:813
+#: build/trans_presets.java:827 build/trans_presets.java:849
+#: build/trans_presets.java:886 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:923
+#: build/trans_presets.java:935 build/trans_presets.java:947
+#: build/trans_presets.java:957 build/trans_presets.java:966
+#: build/trans_presets.java:975
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:800
+#: build/trans_presets.java:801
 msgid "Cycle Barrier"
 msgstr ""
@@ -23692,5 +23931,5 @@
 #. <key key="barrier" value="cycle_barrier" />
 #. item "Barriers/Block"
-#: build/trans_presets.java:804
+#: build/trans_presets.java:805
 msgid "Block"
 msgstr ""
@@ -23698,5 +23937,5 @@
 #. <key key="barrier" value="block" />
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Cattle Grid"
 msgstr ""
@@ -23704,10 +23943,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:809
+#: build/trans_presets.java:810
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:819
+#: build/trans_presets.java:820
 msgid "Bus Trap"
 msgstr ""
@@ -23715,15 +23954,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:823
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:835
 msgid "Toll Booth"
 msgstr ""
@@ -23731,5 +23970,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:836
+#: build/trans_presets.java:837
 msgid "Edit Toll Booth"
 msgstr ""
@@ -23737,10 +23976,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:844
+#: build/trans_presets.java:845
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:845
+#: build/trans_presets.java:846
 msgid "Edit Border Control"
 msgstr ""
@@ -23749,5 +23988,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:860
 msgid "Hedge"
 msgstr ""
@@ -23758,22 +23997,22 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:863 build/trans_presets.java:865
+#: build/trans_presets.java:864 build/trans_presets.java:866
 msgid "Fence"
 msgstr ""
 
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "wire_fence"
 msgstr ""
 
 #. item "Barriers/Wall"
-#: build/trans_presets.java:867
+#: build/trans_presets.java:868
 msgid "Wall"
 msgstr ""
@@ -23781,5 +24020,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "City Wall"
 msgstr ""
@@ -23788,5 +24027,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:875
 msgid "Retaining Wall"
 msgstr ""
@@ -23797,15 +24036,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:882
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:882
+#: build/trans_presets.java:883
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:894
 msgid "Gate"
 msgstr ""
@@ -23813,50 +24052,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:908
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:919
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:920
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:931
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:951
+#: build/trans_presets.java:952
 msgid "Stile"
 msgstr ""
@@ -23864,25 +24103,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:953
+#: build/trans_presets.java:954
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:961
+#: build/trans_presets.java:962
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:963
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:971
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:971
+#: build/trans_presets.java:972
 msgid "Edit Sally Port"
 msgstr ""
@@ -23892,6 +24131,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:985 build/trans_presets.java:986
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:986 build/trans_presets.java:987
+#: build/trans_presets.java:1088
 msgid "Water"
 msgstr ""
@@ -23899,5 +24138,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:989
 msgid "Drain"
 msgstr ""
@@ -23905,10 +24144,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:990
+#: build/trans_presets.java:991
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:997
 msgid "Ditch"
 msgstr ""
@@ -23916,10 +24155,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:999
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Stream"
 msgstr ""
@@ -23927,10 +24166,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:1007
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Canal"
 msgstr ""
@@ -23938,10 +24177,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1021
+#: build/trans_presets.java:1022
 msgid "River"
 msgstr ""
@@ -23951,5 +24190,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:1026
 msgid "Edit River"
 msgstr ""
@@ -23957,5 +24196,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1034
 msgid "Spring"
 msgstr ""
@@ -23963,20 +24202,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1036
 msgid "Edit Spring"
 msgstr ""
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1040
 msgid "Waterfall"
 msgstr ""
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1041
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1047
 msgid "Weir"
 msgstr ""
@@ -23984,10 +24223,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1049
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1054
 msgid "Dam"
 msgstr ""
@@ -23995,21 +24234,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1056
 msgid "Edit Dam"
 msgstr ""
 
+#. item "Water/Water/Groyne"
+#: build/trans_presets.java:1062
+#, fuzzy
+msgid "Groyne"
+msgstr "nici unul"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
+#. item "Water/Water/Groyne" label "Edit Groyne"
+#: build/trans_presets.java:1064
+msgid "Edit Groyne"
+msgstr ""
+
+#. <space />
+#. <key key="man_made" value="groyne" />
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1069
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1070
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1075
 msgid "Reservoir"
 msgstr ""
@@ -24017,15 +24270,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1077
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1082
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1076
+#: build/trans_presets.java:1083
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -24033,20 +24286,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1083
+#: build/trans_presets.java:1090
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1094
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1095
 msgid "Edit Land"
 msgstr ""
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1092
+#: build/trans_presets.java:1099
 msgid "Coastline"
 msgstr ""
@@ -24054,10 +24307,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1094
+#: build/trans_presets.java:1101
 msgid "Edit Coastline"
 msgstr ""
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1105
 msgid "Riverbank"
 msgstr ""
@@ -24066,5 +24319,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1108
 msgid "Edit Riverbank"
 msgstr ""
@@ -24072,5 +24325,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1113
 msgid "Wetland"
 msgstr ""
@@ -24081,13 +24334,13 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1118
 msgid "Edit Wetland"
 msgstr ""
 
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1121
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1121
 msgid "bog"
 msgstr ""
@@ -24101,36 +24354,36 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1114 build/trans_style.java:3610
+#: build/trans_presets.java:1121 build/trans_style.java:3794
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1121
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1121
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1121
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1121
 msgid "mangrove"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1123
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1117
+#: build/trans_presets.java:1124
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1128
 msgid "Beach"
 msgstr ""
@@ -24138,20 +24391,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1130
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1134
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1135
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1139
 msgid "Cliff"
 msgstr ""
@@ -24159,15 +24412,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1141
 msgid "Edit Cliff"
 msgstr ""
 
 #. group "Shipping"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1146
 msgid "Shipping"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1147
 msgid "Ferry Terminal"
 msgstr ""
@@ -24175,18 +24428,18 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1149
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1152
 msgid "Cargo"
 msgstr ""
 
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1152
 msgid "passengers"
 msgstr ""
 
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1152
 msgid "vehicle"
 msgstr ""
@@ -24293,5 +24546,5 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1145 build/trans_presets.java:3668
+#: build/trans_presets.java:1152 build/trans_presets.java:3951
 #: build/trans_style.java:233 build/trans_style.java:689
 #: build/trans_style.java:715 build/trans_style.java:723
@@ -24303,14 +24556,14 @@
 msgstr ""
 
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1152
 msgid "hgv"
 msgstr ""
 
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1152
 msgid "passengers;vehicle"
 msgstr ""
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1154
 msgid "Ferry Route"
 msgstr ""
@@ -24318,5 +24571,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1156
 msgid "Edit Ferry"
 msgstr ""
@@ -24325,15 +24578,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1157
+#: build/trans_presets.java:1164
 msgid "Marina"
 msgstr ""
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1165
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1169
 msgid "Pier"
 msgstr ""
@@ -24341,10 +24594,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1171
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1175
 msgid "Lock Gate"
 msgstr ""
@@ -24353,5 +24606,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1172
+#: build/trans_presets.java:1179
 msgid "Turning Point"
 msgstr ""
@@ -24361,5 +24614,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1184
 msgid "Slipway"
 msgstr ""
@@ -24369,10 +24622,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1188
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1192
 msgid "Boatyard"
 msgstr ""
@@ -24380,10 +24633,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1194
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1199
 msgid "Dock"
 msgstr ""
@@ -24391,20 +24644,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1201
 msgid "Edit Dock"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1208
 msgid "Transport"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1209
 msgid "Railway"
 msgstr ""
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1210
 msgid "Rail"
 msgstr ""
@@ -24412,5 +24665,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1212
 msgid "Edit Rail"
 msgstr ""
@@ -24440,7 +24693,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1245 build/trans_presets.java:1257
-#: build/trans_presets.java:1269 build/trans_presets.java:1281
+#: build/trans_presets.java:1216 build/trans_presets.java:1228
+#: build/trans_presets.java:1252 build/trans_presets.java:1264
+#: build/trans_presets.java:1276 build/trans_presets.java:1288
 msgid "Gauge (mm)"
 msgstr ""
@@ -24456,29 +24709,29 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_presets.java:1246
-#: build/trans_presets.java:1258 build/trans_presets.java:1270
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1217 build/trans_presets.java:1229
+#: build/trans_presets.java:1241 build/trans_presets.java:1253
+#: build/trans_presets.java:1265 build/trans_presets.java:1277
+#: build/trans_presets.java:1289
 msgid "Types"
 msgstr ""
 
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_presets.java:1246
-#: build/trans_presets.java:1258 build/trans_presets.java:1270
-#: build/trans_presets.java:1282 build/trans_presets.java:1311
+#: build/trans_presets.java:1217 build/trans_presets.java:1229
+#: build/trans_presets.java:1241 build/trans_presets.java:1253
+#: build/trans_presets.java:1265 build/trans_presets.java:1277
+#: build/trans_presets.java:1289 build/trans_presets.java:1318
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_presets.java:1246
-#: build/trans_presets.java:1258 build/trans_presets.java:1270
-#: build/trans_presets.java:1282 build/trans_presets.java:1311
+#: build/trans_presets.java:1217 build/trans_presets.java:1229
+#: build/trans_presets.java:1241 build/trans_presets.java:1253
+#: build/trans_presets.java:1265 build/trans_presets.java:1277
+#: build/trans_presets.java:1289 build/trans_presets.java:1318
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_presets.java:1246
-#: build/trans_presets.java:1258 build/trans_presets.java:1270
-#: build/trans_presets.java:1282 build/trans_presets.java:1311
+#: build/trans_presets.java:1217 build/trans_presets.java:1229
+#: build/trans_presets.java:1241 build/trans_presets.java:1253
+#: build/trans_presets.java:1265 build/trans_presets.java:1277
+#: build/trans_presets.java:1289 build/trans_presets.java:1318
 msgid "spur"
 msgstr ""
@@ -24491,15 +24744,15 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1211 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:1218 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
 msgid "Electrified"
 msgstr ""
 
-#: build/trans_presets.java:1211 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:1218 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
 msgid "contact_line"
 msgstr ""
@@ -24569,8 +24822,8 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1211 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_style.java:781
+#: build/trans_presets.java:1218 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_style.java:781
 #: build/trans_style.java:1268 build/trans_style.java:1332
 #: build/trans_style.java:1340 build/trans_style.java:1349
@@ -24587,10 +24840,12 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
+#. item "Car/Charging Station" text "Voltage"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:1212 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:2791
+#: build/trans_presets.java:1219 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:1445
+#: build/trans_presets.java:2886
 msgid "Voltage"
 msgstr ""
@@ -24603,15 +24858,15 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1213 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:1220 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
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: build/trans_presets.java:1213 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:1220 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
 msgid "16.7"
 msgstr ""
@@ -24619,10 +24874,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1223
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1224
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
@@ -24630,5 +24885,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1235
 msgid "Monorail"
 msgstr ""
@@ -24636,5 +24891,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1237
 msgid "Edit Monorail"
 msgstr ""
@@ -24642,10 +24897,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1247
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1248
 msgid "Edit Preserved Railway"
 msgstr ""
@@ -24653,10 +24908,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:1259
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1260
 msgid "Edit Light Rail"
 msgstr ""
@@ -24664,10 +24919,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1271
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1272
 msgid "Edit Subway"
 msgstr ""
@@ -24675,10 +24930,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1283
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1284
 msgid "Edit Tram"
 msgstr ""
@@ -24686,5 +24941,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1295
 msgid "Bus Guideway"
 msgstr ""
@@ -24692,5 +24947,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:1290
+#: build/trans_presets.java:1297
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -24699,10 +24954,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:1314
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1315
 msgid "Edit Disused Railway"
 msgstr ""
@@ -24711,10 +24966,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1318
 msgid "Optional Types"
 msgstr ""
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1320
 msgid "Abandoned Rail"
 msgstr ""
@@ -24723,5 +24978,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1324
 msgid "Level Crossing"
 msgstr ""
@@ -24730,5 +24985,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1328
 msgid "Crossing"
 msgstr ""
@@ -24738,5 +24993,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1332
 msgid "Crossing type"
 msgstr ""
@@ -24744,5 +24999,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1338
 msgid "Turntable"
 msgstr ""
@@ -24751,5 +25006,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1342
 msgid "Buffer Stop"
 msgstr ""
@@ -24758,10 +25013,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1347
 msgid "Aerialway"
 msgstr ""
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1348
 msgid "Chair Lift"
 msgstr ""
@@ -24769,10 +25024,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1350
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1354
 msgid "Drag Lift"
 msgstr ""
@@ -24780,10 +25035,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1356
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1360
 msgid "Cable Car"
 msgstr ""
@@ -24791,10 +25046,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1362
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1366
 msgid "Gondola"
 msgstr ""
@@ -24802,5 +25057,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1368
 msgid "Edit Gondola"
 msgstr ""
@@ -24808,5 +25063,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1373
 msgctxt "aerialway"
 msgid "Station"
@@ -24815,5 +25070,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1375
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24821,5 +25076,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1379
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24828,5 +25083,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1381
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24834,5 +25089,5 @@
 
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1385
 msgctxt "aerialway"
 msgid "Goods"
@@ -24840,11 +25095,101 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1386
 msgctxt "aerialway"
 msgid "Edit Goods"
 msgstr ""
 
+#. item "Car/Parking"
+#. item "Motorcycle/Parking"
+#. item "Bicycle/Parking"
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="village"/>
+#. <!--
+#. <action class="SetNodeAction" params=""/>
+#. <action class="AnnotationPresetAction" params="Places"/>
+#. -->
+#. </button>
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
+#: build/trans_presets.java:1393 build/trans_presets.java:1507
+#: build/trans_presets.java:1538 build/trans_surveyor.java:24
+msgid "Parking"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
+#. item "Car/Parking" label "Edit Parking"
+#: build/trans_presets.java:1396
+msgid "Edit Parking"
+msgstr ""
+
+#. item "Car/Parking" text "Reference number"
+#. item "Tourism/Information Terminal" text "Reference number"
+#. item "Tourism/Audioguide" text "Reference number"
+#. item "Amenities/Toilets" text "Reference number"
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:1399 build/trans_presets.java:2157
+#: build/trans_presets.java:2167 build/trans_presets.java:2897
+#: build/trans_presets.java:3388
+msgid "Reference number"
+msgstr ""
+
+#: build/trans_presets.java:1400 build/trans_presets.java:1512
+msgid "multi-storey"
+msgstr ""
+
+#: build/trans_presets.java:1400 build/trans_presets.java:1512
+msgid "surface"
+msgstr ""
+
+#: build/trans_presets.java:1400 build/trans_presets.java:1512
+#: build/trans_presets.java:2794
+msgid "underground"
+msgstr ""
+
+#. item "Car/Parking" combo "Park and Ride"
+#: build/trans_presets.java:1401
+msgid "Park and Ride"
+msgstr ""
+
+#. item "Car/Parking" combo "Fee"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Tourism/Information Terminal" combo "Fee"
+#. item "Tourism/Audioguide" combo "Fee"
+#. item "Amenities/Toilets" combo "Fee"
+#: build/trans_presets.java:1402 build/trans_presets.java:1513
+#: build/trans_presets.java:2158 build/trans_presets.java:2168
+#: build/trans_presets.java:2898
+msgid "Fee"
+msgstr ""
+
+#. <space />
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1404
+msgid "Capacity (overall)"
+msgstr ""
+
+#. item "Car/Parking" combo "Spaces for Disabled"
+#: build/trans_presets.java:1405
+msgid "Spaces for Disabled"
+msgstr ""
+
+#. item "Car/Parking" combo "Spaces for Women"
+#: build/trans_presets.java:1406
+msgid "Spaces for Women"
+msgstr ""
+
+#. item "Car/Parking" combo "Spaces for Parents"
+#: build/trans_presets.java:1407
+msgid "Spaces for Parents"
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1408
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1411
 msgid "Fuel"
 msgstr ""
@@ -24854,5 +25199,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1415
 msgid "Edit Fuel"
 msgstr ""
@@ -24866,64 +25211,64 @@
 #. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1392 build/trans_presets.java:1436
-#: build/trans_presets.java:1451 build/trans_presets.java:1459
-#: build/trans_presets.java:1474 build/trans_presets.java:1483
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:1417 build/trans_presets.java:1452
+#: build/trans_presets.java:1468 build/trans_presets.java:1476
+#: build/trans_presets.java:1492 build/trans_presets.java:1501
+#: build/trans_presets.java:1520
 msgid "Brand"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1417
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1392 build/trans_presets.java:1502
+#: build/trans_presets.java:1417 build/trans_presets.java:1520
 msgid "Independent"
 msgstr ""
@@ -24951,4 +25296,5 @@
 #. item "Historic Places/Ruins" combo "Opening Hours"
 #. item "Historic Places/Archaeological Site" combo "Opening Hours"
+#. item "Leisure/Sauna" combo "Opening Hours"
 #. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours"
 #. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours"
@@ -24958,6 +25304,11 @@
 #. item "Food/Convenience Store" combo "Opening Hours"
 #. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Confectionery" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
 #. item "Food/Butcher" combo "Opening Hours"
-#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Seafood" combo "Opening Hours"
+#. item "Food/Deli (Fine Food)" combo "Opening Hours"
+#. item "Food/Marketplace" combo "Opening Hours"
+#. item "Food/Greengrocer" combo "Opening Hours"
 #. item "Food/Organic" combo "Opening Hours"
 #. item "Food/Alcohol" combo "Opening Hours"
@@ -24966,5 +25317,11 @@
 #. item "Shops/Hairdresser" combo "Opening Hours"
 #. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Hearing Aids" combo "Opening Hours"
+#. item "Shops/Jewelry" combo "Opening Hours"
+#. item "Shops/Erotic" combo "Opening Hours"
+#. item "Shops/Department Store" combo "Opening Hours"
+#. item "Shops/Mall" combo "Opening Hours"
 #. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Boutique" combo "Opening Hours"
 #. item "Shops/Shoes" combo "Opening Hours"
 #. item "Shops/Outdoor" combo "Opening Hours"
@@ -24973,6 +25330,9 @@
 #. item "Shops/Laundry" combo "Opening Hours"
 #. item "Shops/Tailor" combo "Opening Hours"
+#. item "Shops/Fabric" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
+#. item "Shops/Mobile Phone" combo "Opening Hours"
+#. item "Shops/Vacuum Cleaner" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
 #. item "Shops/Video" combo "Opening Hours"
@@ -24980,10 +25340,17 @@
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
+#. item "Shops/Paint" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
 #. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Kitchen" combo "Opening Hours"
+#. item "Shops/Curtain" combo "Opening Hours"
+#. item "Shops/Frame" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
+#. item "Shops/Copyshop" combo "Opening Hours"
 #. item "Shops/Book Store" combo "Opening Hours"
 #. item "Shops/Travel Agency" combo "Opening Hours"
+#. item "Shops/Musical Instrument" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
+#. item "Shops/Variety Store" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24993,331 +25360,294 @@
 #. item "Health/Baby Hatch" text "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1396 build/trans_presets.java:1438
-#: build/trans_presets.java:1453 build/trans_presets.java:1461
-#: build/trans_presets.java:1476 build/trans_presets.java:1485
-#: build/trans_presets.java:1504 build/trans_presets.java:1864
-#: build/trans_presets.java:1884 build/trans_presets.java:1901
-#: build/trans_presets.java:1920 build/trans_presets.java:1939
-#: build/trans_presets.java:1955 build/trans_presets.java:1972
-#: build/trans_presets.java:1989 build/trans_presets.java:2005
-#: build/trans_presets.java:2012 build/trans_presets.java:2021
-#: build/trans_presets.java:2028 build/trans_presets.java:2062
-#: build/trans_presets.java:2151 build/trans_presets.java:2159
-#: build/trans_presets.java:2262 build/trans_presets.java:2268
-#: build/trans_presets.java:2632 build/trans_presets.java:2656
-#: build/trans_presets.java:2899 build/trans_presets.java:2906
-#: build/trans_presets.java:2913 build/trans_presets.java:2920
-#: build/trans_presets.java:2927 build/trans_presets.java:2933
-#: build/trans_presets.java:2940 build/trans_presets.java:2946
-#: build/trans_presets.java:2954 build/trans_presets.java:2960
-#: build/trans_presets.java:2966 build/trans_presets.java:2973
-#: build/trans_presets.java:2979 build/trans_presets.java:2986
-#: build/trans_presets.java:2992 build/trans_presets.java:2999
-#: build/trans_presets.java:3006 build/trans_presets.java:3012
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3037
-#: build/trans_presets.java:3045 build/trans_presets.java:3052
-#: build/trans_presets.java:3059 build/trans_presets.java:3066
-#: build/trans_presets.java:3072 build/trans_presets.java:3078
-#: build/trans_presets.java:3084 build/trans_presets.java:3090
-#: build/trans_presets.java:3096 build/trans_presets.java:3122
-#: build/trans_presets.java:3130 build/trans_presets.java:3145
-#: build/trans_presets.java:3151 build/trans_presets.java:3159
-#: build/trans_presets.java:3172 build/trans_presets.java:3193
+#: build/trans_presets.java:1421 build/trans_presets.java:1454
+#: build/trans_presets.java:1470 build/trans_presets.java:1478
+#: build/trans_presets.java:1494 build/trans_presets.java:1503
+#: build/trans_presets.java:1522 build/trans_presets.java:1897
+#: build/trans_presets.java:1917 build/trans_presets.java:1934
+#: build/trans_presets.java:1953 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2022 build/trans_presets.java:2038
+#: build/trans_presets.java:2045 build/trans_presets.java:2054
+#: build/trans_presets.java:2061 build/trans_presets.java:2104
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2269 build/trans_presets.java:2316
+#: build/trans_presets.java:2322 build/trans_presets.java:2706
+#: build/trans_presets.java:2730 build/trans_presets.java:2994
+#: build/trans_presets.java:3001 build/trans_presets.java:3008
+#: build/trans_presets.java:3015 build/trans_presets.java:3022
+#: build/trans_presets.java:3029 build/trans_presets.java:3038
+#: build/trans_presets.java:3047 build/trans_presets.java:3056
+#: build/trans_presets.java:3065 build/trans_presets.java:3071
+#: build/trans_presets.java:3078 build/trans_presets.java:3084
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3113
+#: build/trans_presets.java:3122 build/trans_presets.java:3131
+#: build/trans_presets.java:3141 build/trans_presets.java:3150
+#: build/trans_presets.java:3157 build/trans_presets.java:3166
+#: build/trans_presets.java:3172 build/trans_presets.java:3179
+#: build/trans_presets.java:3185 build/trans_presets.java:3192
+#: build/trans_presets.java:3199 build/trans_presets.java:3205
+#: build/trans_presets.java:3214 build/trans_presets.java:3221
+#: build/trans_presets.java:3227 build/trans_presets.java:3236
+#: build/trans_presets.java:3245 build/trans_presets.java:3251
+#: build/trans_presets.java:3257 build/trans_presets.java:3265
+#: build/trans_presets.java:3272 build/trans_presets.java:3279
+#: build/trans_presets.java:3288 build/trans_presets.java:3295
+#: build/trans_presets.java:3301 build/trans_presets.java:3310
+#: build/trans_presets.java:3319 build/trans_presets.java:3328
+#: build/trans_presets.java:3334 build/trans_presets.java:3343
+#: build/trans_presets.java:3349 build/trans_presets.java:3355
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3379 build/trans_presets.java:3405
+#: build/trans_presets.java:3413 build/trans_presets.java:3428
+#: build/trans_presets.java:3434 build/trans_presets.java:3442
+#: build/trans_presets.java:3455 build/trans_presets.java:3476
 msgid "Opening Hours"
 msgstr ""
 
-#: build/trans_presets.java:1396 build/trans_presets.java:1438
-#: build/trans_presets.java:1453 build/trans_presets.java:1461
-#: build/trans_presets.java:1476 build/trans_presets.java:1485
-#: build/trans_presets.java:1504 build/trans_presets.java:1864
-#: build/trans_presets.java:1884 build/trans_presets.java:1901
-#: build/trans_presets.java:1920 build/trans_presets.java:1939
-#: build/trans_presets.java:1955 build/trans_presets.java:1972
-#: build/trans_presets.java:1989 build/trans_presets.java:2012
-#: build/trans_presets.java:2021 build/trans_presets.java:2028
-#: build/trans_presets.java:2062 build/trans_presets.java:2151
-#: build/trans_presets.java:2159 build/trans_presets.java:2262
-#: build/trans_presets.java:2268 build/trans_presets.java:2632
-#: build/trans_presets.java:2656 build/trans_presets.java:2899
-#: build/trans_presets.java:2906 build/trans_presets.java:2913
-#: build/trans_presets.java:2920 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2973 build/trans_presets.java:2979
-#: build/trans_presets.java:2986 build/trans_presets.java:2992
-#: build/trans_presets.java:2999 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3019
-#: build/trans_presets.java:3025 build/trans_presets.java:3031
-#: build/trans_presets.java:3037 build/trans_presets.java:3045
-#: build/trans_presets.java:3052 build/trans_presets.java:3059
-#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:1421 build/trans_presets.java:1454
+#: build/trans_presets.java:1470 build/trans_presets.java:1478
+#: build/trans_presets.java:1494 build/trans_presets.java:1503
+#: build/trans_presets.java:1522 build/trans_presets.java:1897
+#: build/trans_presets.java:1917 build/trans_presets.java:1934
+#: build/trans_presets.java:1953 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2022 build/trans_presets.java:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2061
+#: build/trans_presets.java:2104 build/trans_presets.java:2193
+#: build/trans_presets.java:2201 build/trans_presets.java:2316
+#: build/trans_presets.java:2322 build/trans_presets.java:2706
+#: build/trans_presets.java:2730 build/trans_presets.java:2994
+#: build/trans_presets.java:3001 build/trans_presets.java:3008
+#: build/trans_presets.java:3015 build/trans_presets.java:3022
+#: build/trans_presets.java:3029 build/trans_presets.java:3038
+#: build/trans_presets.java:3047 build/trans_presets.java:3056
+#: build/trans_presets.java:3065 build/trans_presets.java:3071
 #: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3122 build/trans_presets.java:3130
-#: build/trans_presets.java:3145 build/trans_presets.java:3151
-#: build/trans_presets.java:3159 build/trans_presets.java:3193
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3113
+#: build/trans_presets.java:3122 build/trans_presets.java:3131
+#: build/trans_presets.java:3141 build/trans_presets.java:3150
+#: build/trans_presets.java:3157 build/trans_presets.java:3166
+#: build/trans_presets.java:3172 build/trans_presets.java:3179
+#: build/trans_presets.java:3185 build/trans_presets.java:3192
+#: build/trans_presets.java:3199 build/trans_presets.java:3205
+#: build/trans_presets.java:3214 build/trans_presets.java:3221
+#: build/trans_presets.java:3227 build/trans_presets.java:3236
+#: build/trans_presets.java:3245 build/trans_presets.java:3251
+#: build/trans_presets.java:3257 build/trans_presets.java:3265
+#: build/trans_presets.java:3272 build/trans_presets.java:3279
+#: build/trans_presets.java:3288 build/trans_presets.java:3295
+#: build/trans_presets.java:3301 build/trans_presets.java:3310
+#: build/trans_presets.java:3319 build/trans_presets.java:3328
+#: build/trans_presets.java:3334 build/trans_presets.java:3343
+#: build/trans_presets.java:3349 build/trans_presets.java:3355
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3379 build/trans_presets.java:3405
+#: build/trans_presets.java:3413 build/trans_presets.java:3428
+#: build/trans_presets.java:3434 build/trans_presets.java:3442
+#: build/trans_presets.java:3476
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1396 build/trans_presets.java:1438
-#: build/trans_presets.java:1453 build/trans_presets.java:1461
-#: build/trans_presets.java:1476 build/trans_presets.java:1485
-#: build/trans_presets.java:1504 build/trans_presets.java:1864
-#: build/trans_presets.java:1884 build/trans_presets.java:1901
-#: build/trans_presets.java:1920 build/trans_presets.java:1939
-#: build/trans_presets.java:1955 build/trans_presets.java:1972
-#: build/trans_presets.java:1989 build/trans_presets.java:2012
-#: build/trans_presets.java:2021 build/trans_presets.java:2028
-#: build/trans_presets.java:2062 build/trans_presets.java:2151
-#: build/trans_presets.java:2159 build/trans_presets.java:2262
-#: build/trans_presets.java:2268 build/trans_presets.java:2632
-#: build/trans_presets.java:2656 build/trans_presets.java:2899
-#: build/trans_presets.java:2906 build/trans_presets.java:2913
-#: build/trans_presets.java:2920 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2973 build/trans_presets.java:2979
-#: build/trans_presets.java:2986 build/trans_presets.java:2992
-#: build/trans_presets.java:2999 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3019
-#: build/trans_presets.java:3025 build/trans_presets.java:3031
-#: build/trans_presets.java:3037 build/trans_presets.java:3045
-#: build/trans_presets.java:3052 build/trans_presets.java:3059
-#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:1421 build/trans_presets.java:1454
+#: build/trans_presets.java:1470 build/trans_presets.java:1478
+#: build/trans_presets.java:1494 build/trans_presets.java:1503
+#: build/trans_presets.java:1522 build/trans_presets.java:1897
+#: build/trans_presets.java:1917 build/trans_presets.java:1934
+#: build/trans_presets.java:1953 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2022 build/trans_presets.java:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2061
+#: build/trans_presets.java:2104 build/trans_presets.java:2193
+#: build/trans_presets.java:2201 build/trans_presets.java:2269
+#: build/trans_presets.java:2316 build/trans_presets.java:2322
+#: build/trans_presets.java:2706 build/trans_presets.java:2730
+#: build/trans_presets.java:2994 build/trans_presets.java:3001
+#: build/trans_presets.java:3008 build/trans_presets.java:3015
+#: build/trans_presets.java:3022 build/trans_presets.java:3029
+#: build/trans_presets.java:3038 build/trans_presets.java:3047
+#: build/trans_presets.java:3056 build/trans_presets.java:3065
+#: build/trans_presets.java:3071 build/trans_presets.java:3078
+#: build/trans_presets.java:3084 build/trans_presets.java:3092
+#: build/trans_presets.java:3098 build/trans_presets.java:3104
+#: build/trans_presets.java:3113 build/trans_presets.java:3122
+#: build/trans_presets.java:3131 build/trans_presets.java:3141
+#: build/trans_presets.java:3150 build/trans_presets.java:3157
+#: build/trans_presets.java:3166 build/trans_presets.java:3172
+#: build/trans_presets.java:3179 build/trans_presets.java:3185
+#: build/trans_presets.java:3192 build/trans_presets.java:3199
+#: build/trans_presets.java:3205 build/trans_presets.java:3214
+#: build/trans_presets.java:3221 build/trans_presets.java:3227
+#: build/trans_presets.java:3236 build/trans_presets.java:3245
+#: build/trans_presets.java:3251 build/trans_presets.java:3257
+#: build/trans_presets.java:3265 build/trans_presets.java:3272
+#: build/trans_presets.java:3279 build/trans_presets.java:3288
+#: build/trans_presets.java:3295 build/trans_presets.java:3301
+#: build/trans_presets.java:3310 build/trans_presets.java:3319
+#: build/trans_presets.java:3328 build/trans_presets.java:3334
+#: build/trans_presets.java:3343 build/trans_presets.java:3349
+#: build/trans_presets.java:3355 build/trans_presets.java:3364
+#: build/trans_presets.java:3370 build/trans_presets.java:3379
+#: build/trans_presets.java:3405 build/trans_presets.java:3413
+#: build/trans_presets.java:3428 build/trans_presets.java:3434
+#: build/trans_presets.java:3442 build/trans_presets.java:3476
+msgid "Mo-Fr 08:30-20:00"
+msgstr ""
+
+#: build/trans_presets.java:1421 build/trans_presets.java:1454
+#: build/trans_presets.java:1470 build/trans_presets.java:1478
+#: build/trans_presets.java:1494 build/trans_presets.java:1503
+#: build/trans_presets.java:1522 build/trans_presets.java:1897
+#: build/trans_presets.java:1917 build/trans_presets.java:1934
+#: build/trans_presets.java:1953 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2022 build/trans_presets.java:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2061
+#: build/trans_presets.java:2104 build/trans_presets.java:2193
+#: build/trans_presets.java:2201 build/trans_presets.java:2316
+#: build/trans_presets.java:2322 build/trans_presets.java:2706
+#: build/trans_presets.java:2730 build/trans_presets.java:2994
+#: build/trans_presets.java:3001 build/trans_presets.java:3008
+#: build/trans_presets.java:3015 build/trans_presets.java:3022
+#: build/trans_presets.java:3029 build/trans_presets.java:3071
 #: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3122 build/trans_presets.java:3130
-#: build/trans_presets.java:3145 build/trans_presets.java:3151
-#: build/trans_presets.java:3159 build/trans_presets.java:3193
-msgid "Mo-Fr 08:30-20:00"
-msgstr ""
-
-#: build/trans_presets.java:1396 build/trans_presets.java:1438
-#: build/trans_presets.java:1453 build/trans_presets.java:1461
-#: build/trans_presets.java:1476 build/trans_presets.java:1485
-#: build/trans_presets.java:1504 build/trans_presets.java:1864
-#: build/trans_presets.java:1884 build/trans_presets.java:1901
-#: build/trans_presets.java:1920 build/trans_presets.java:1939
-#: build/trans_presets.java:1955 build/trans_presets.java:1972
-#: build/trans_presets.java:1989 build/trans_presets.java:2012
-#: build/trans_presets.java:2021 build/trans_presets.java:2028
-#: build/trans_presets.java:2062 build/trans_presets.java:2151
-#: build/trans_presets.java:2159 build/trans_presets.java:2262
-#: build/trans_presets.java:2268 build/trans_presets.java:2632
-#: build/trans_presets.java:2656 build/trans_presets.java:2899
-#: build/trans_presets.java:2906 build/trans_presets.java:2913
-#: build/trans_presets.java:2920 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2973 build/trans_presets.java:2979
-#: build/trans_presets.java:2986 build/trans_presets.java:2992
-#: build/trans_presets.java:2999 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3019
-#: build/trans_presets.java:3025 build/trans_presets.java:3031
-#: build/trans_presets.java:3037 build/trans_presets.java:3045
-#: build/trans_presets.java:3052 build/trans_presets.java:3059
-#: build/trans_presets.java:3066 build/trans_presets.java:3072
-#: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3122 build/trans_presets.java:3130
-#: build/trans_presets.java:3145 build/trans_presets.java:3151
-#: build/trans_presets.java:3159 build/trans_presets.java:3193
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3157
+#: build/trans_presets.java:3172 build/trans_presets.java:3179
+#: build/trans_presets.java:3185 build/trans_presets.java:3192
+#: build/trans_presets.java:3199 build/trans_presets.java:3205
+#: build/trans_presets.java:3221 build/trans_presets.java:3227
+#: build/trans_presets.java:3251 build/trans_presets.java:3257
+#: build/trans_presets.java:3265 build/trans_presets.java:3272
+#: build/trans_presets.java:3279 build/trans_presets.java:3295
+#: build/trans_presets.java:3301 build/trans_presets.java:3334
+#: build/trans_presets.java:3349 build/trans_presets.java:3355
+#: build/trans_presets.java:3370 build/trans_presets.java:3405
+#: build/trans_presets.java:3413 build/trans_presets.java:3428
+#: build/trans_presets.java:3434 build/trans_presets.java:3442
+#: build/trans_presets.java:3476
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1422
 msgid "With shop"
 msgstr ""
 
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1422
 msgid "convenience"
 msgstr ""
 
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1422
 msgid "kiosk"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1423
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1424
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1425
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1426
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1427
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1428
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:1429
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1405
+#: build/trans_presets.java:1430
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1431
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1432
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1433
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1434
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1435
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1411
+#: build/trans_presets.java:1436
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1437
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. </optional>
-#. item "Car/Parking"
-#. item "Motorcycle/Parking"
-#. item "Bicycle/Parking"
-#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
-#. <action class="SetWaypointAction" params="village"/>
-#. <!--
-#. <action class="SetNodeAction" params=""/>
-#. <action class="AnnotationPresetAction" params="Places"/>
-#. -->
-#. </button>
-#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1415 build/trans_presets.java:1489
-#: build/trans_presets.java:1519 build/trans_surveyor.java:24
-msgid "Parking"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1418
-msgid "Edit Parking"
-msgstr ""
-
-#. item "Car/Parking" text "Reference number"
-#. item "Tourism/Information Terminal" text "Reference number"
-#. item "Tourism/Audioguide" text "Reference number"
-#. item "Amenities/Toilets" text "Reference number"
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:1421 build/trans_presets.java:2115
-#: build/trans_presets.java:2125 build/trans_presets.java:2802
-#: build/trans_presets.java:3105
-msgid "Reference number"
-msgstr ""
-
-#: build/trans_presets.java:1422 build/trans_presets.java:1494
-msgid "multi-storey"
-msgstr ""
-
-#: build/trans_presets.java:1422 build/trans_presets.java:1494
-msgid "surface"
-msgstr ""
-
-#: build/trans_presets.java:1422 build/trans_presets.java:1494
-#: build/trans_presets.java:2704
-msgid "underground"
-msgstr ""
-
-#. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1423
-msgid "Park and Ride"
-msgstr ""
-
-#. item "Car/Parking" combo "Fee"
-#. item "Motorcycle/Parking" combo "Fee"
-#. item "Tourism/Information Terminal" combo "Fee"
-#. item "Tourism/Audioguide" combo "Fee"
-#. item "Amenities/Toilets" combo "Fee"
-#: build/trans_presets.java:1424 build/trans_presets.java:1495
-#: build/trans_presets.java:2116 build/trans_presets.java:2126
-#: build/trans_presets.java:2803
-msgid "Fee"
-msgstr ""
-
-#. <space />
-#. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1426
-msgid "Capacity (overall)"
-msgstr ""
-
-#. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1427
-msgid "Spaces for Disabled"
-msgstr ""
-
-#. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1428
-msgid "Spaces for Women"
-msgstr ""
-
-#. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1429
-msgid "Spaces for Parents"
-msgstr ""
-
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1430
-msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+#. item "Car/Charging Station"
+#: build/trans_presets.java:1440
+msgid "Charging Station"
+msgstr ""
+
+#. <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:1442
+msgid "Edit Charging Station (for electric cars)"
+msgstr ""
+
+#. item "Car/Charging Station" text "Amperage"
+#: build/trans_presets.java:1446
+#, fuzzy
+msgid "Amperage"
+msgstr "Pagina pricipală"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1448
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1449
 msgid "Edit Car Wash"
 msgstr ""
 
+#. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1457
 msgid "Car Dealer"
 msgstr ""
@@ -25325,5 +25655,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1459
 msgid "Edit Car Shop"
 msgstr ""
@@ -25331,20 +25661,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1447 build/trans_presets.java:1508
+#: build/trans_presets.java:1464 build/trans_presets.java:1526
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1465
 msgid "Edit Car Repair"
 msgstr ""
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1472
 msgid "Tyres"
 msgstr ""
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1456
+#: build/trans_presets.java:1473
 msgid "Edit Tyres"
 msgstr ""
@@ -25352,5 +25682,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1462 build/trans_presets.java:1511
+#: build/trans_presets.java:1479 build/trans_presets.java:1530
 msgid "Contact:"
 msgstr ""
@@ -25393,14 +25723,14 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1463 build/trans_presets.java:1512
-#: build/trans_presets.java:1724 build/trans_presets.java:1742
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1832 build/trans_presets.java:1849
-#: build/trans_presets.java:1872 build/trans_presets.java:1891
-#: build/trans_presets.java:1908 build/trans_presets.java:1927
-#: build/trans_presets.java:1946 build/trans_presets.java:1962
-#: build/trans_presets.java:1979 build/trans_presets.java:1994
-#: build/trans_presets.java:3183 build/trans_presets.java:3604
+#: build/trans_presets.java:1480 build/trans_presets.java:1531
+#: 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:1843
+#: build/trans_presets.java:1865 build/trans_presets.java:1882
+#: build/trans_presets.java:1905 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:2027
+#: build/trans_presets.java:3466 build/trans_presets.java:3887
 msgid "Phone Number"
 msgstr ""
@@ -25425,14 +25755,14 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1464 build/trans_presets.java:1513
-#: build/trans_presets.java:1725 build/trans_presets.java:1743
-#: build/trans_presets.java:1759 build/trans_presets.java:1776
-#: build/trans_presets.java:1794 build/trans_presets.java:1811
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1873 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1928
-#: build/trans_presets.java:1947 build/trans_presets.java:1963
-#: build/trans_presets.java:1980 build/trans_presets.java:1995
-#: build/trans_presets.java:3605
+#: build/trans_presets.java:1481 build/trans_presets.java:1532
+#: build/trans_presets.java:1758 build/trans_presets.java:1776
+#: build/trans_presets.java:1792 build/trans_presets.java:1809
+#: build/trans_presets.java:1827 build/trans_presets.java:1844
+#: build/trans_presets.java:1866 build/trans_presets.java:1883
+#: build/trans_presets.java:1906 build/trans_presets.java:1925
+#: build/trans_presets.java:1942 build/trans_presets.java:1961
+#: build/trans_presets.java:1980 build/trans_presets.java:1996
+#: build/trans_presets.java:2013 build/trans_presets.java:2028
+#: build/trans_presets.java:3888
 msgid "Fax Number"
 msgstr ""
@@ -25456,16 +25786,17 @@
 #. item "Food+Drinks/Bar" text "Website"
 #. item "Food+Drinks/Nightclub" text "Website"
+#. item "Man-Made/Buildings/Studio" text "Website"
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1465 build/trans_presets.java:1514
-#: build/trans_presets.java:1726 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1777
-#: build/trans_presets.java:1795 build/trans_presets.java:1812
-#: build/trans_presets.java:1834 build/trans_presets.java:1851
-#: build/trans_presets.java:1874 build/trans_presets.java:1893
-#: build/trans_presets.java:1910 build/trans_presets.java:1929
-#: build/trans_presets.java:1948 build/trans_presets.java:1964
-#: build/trans_presets.java:1981 build/trans_presets.java:1996
-#: build/trans_presets.java:3607
+#: build/trans_presets.java:1482 build/trans_presets.java:1533
+#: 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:1867 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:2029
+#: build/trans_presets.java:2657 build/trans_presets.java:3890
 msgid "Website"
 msgstr ""
@@ -25490,22 +25821,23 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1466 build/trans_presets.java:1515
-#: build/trans_presets.java:1727 build/trans_presets.java:1745
-#: build/trans_presets.java:1761 build/trans_presets.java:1778
-#: build/trans_presets.java:1796 build/trans_presets.java:1813
-#: build/trans_presets.java:1835 build/trans_presets.java:1852
-#: build/trans_presets.java:1875 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1930
-#: build/trans_presets.java:1949 build/trans_presets.java:1965
-#: build/trans_presets.java:1982 build/trans_presets.java:1997
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:1483 build/trans_presets.java:1534
+#: 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:1868 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:2030
+#: build/trans_presets.java:3891
 msgid "Email Address"
 msgstr ""
 
+#. <separator/>
 #. item "Car/Rental"
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1468 build/trans_presets.java:1507
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1486 build/trans_presets.java:1525
+#: build/trans_presets.java:1552
 msgid "Rental"
 msgstr ""
@@ -25514,10 +25846,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1489
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1496
 msgid "Sharing"
 msgstr ""
@@ -25525,10 +25857,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1480
+#: build/trans_presets.java:1498
 msgid "Edit Car Sharing"
 msgstr ""
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1508
 msgid "Edit Motorcycle Parking"
 msgstr ""
@@ -25536,10 +25868,10 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1493 build/trans_presets.java:1524
+#: build/trans_presets.java:1511 build/trans_presets.java:1543
 msgid "Capacity"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1515
 msgid "Motorcycle Dealer"
 msgstr ""
@@ -25547,32 +25879,52 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1499
+#: build/trans_presets.java:1517
 msgid "Edit Shop Motorcycle"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1523
 msgid "Services:"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1524
 msgid "Sale"
 msgstr ""
 
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1524
+#, fuzzy
+msgctxt "motorcycle"
+msgid "yes"
+msgstr "Straturi"
+
+#: build/trans_presets.java:1524
+msgctxt "motorcycle"
+msgid "brand"
+msgstr ""
+
+#: build/trans_presets.java:1524
+#, fuzzy
+msgctxt "motorcycle"
 msgid "used"
-msgstr ""
-
-#: build/trans_presets.java:1508 build/trans_presets.java:1509
+msgstr "utilizare"
+
+#: build/trans_presets.java:1524
+#, fuzzy
+msgctxt "motorcycle"
+msgid "no"
+msgstr "Informaţii"
+
+#: build/trans_presets.java:1525 build/trans_presets.java:1526
+#: build/trans_presets.java:1527 build/trans_presets.java:1528
 msgid "brand"
 msgstr ""
 
-#: build/trans_presets.java:1508 build/trans_presets.java:1509
+#: build/trans_presets.java:1526 build/trans_presets.java:1527
 msgid "oldtimer"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1527
 msgid "Parts"
 msgstr ""
@@ -25582,6 +25934,6 @@
 #. <separator/>
 #. item "Shops/Clothes"
-#: build/trans_presets.java:1510 build/trans_presets.java:2847
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:1528 build/trans_presets.java:2942
+#: build/trans_presets.java:3153
 msgid "Clothes"
 msgstr ""
@@ -25589,10 +25941,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1540
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1545
 msgid "Bike Dealer"
 msgstr ""
@@ -25601,5 +25953,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1548
 msgid "Edit Bicycle Shop"
 msgstr ""
@@ -25608,10 +25960,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1555
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1561
 msgctxt "railway"
 msgid "Station"
@@ -25621,5 +25973,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1564
 msgctxt "railway"
 msgid "Edit Station"
@@ -25627,5 +25979,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1569
 msgid "UIC-Reference"
 msgstr ""
@@ -25633,5 +25985,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1572
 msgid "Railway Halt"
 msgstr ""
@@ -25639,5 +25991,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1574
 msgid "Edit Halt"
 msgstr ""
@@ -25645,5 +25997,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1581
 msgid "Tram Stop"
 msgstr ""
@@ -25652,5 +26004,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:1565
+#: build/trans_presets.java:1584
 msgid "Edit Tram Stop"
 msgstr ""
@@ -25658,5 +26010,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1591
 msgid "Railway Platform"
 msgstr ""
@@ -25665,5 +26017,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:1575
+#: build/trans_presets.java:1594
 msgid "Edit Railway Platform"
 msgstr ""
@@ -25675,5 +26027,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1578 build/trans_presets.java:1623
+#: build/trans_presets.java:1597 build/trans_presets.java:1642
 msgid "Reference (track number)"
 msgstr ""
@@ -25681,10 +26033,10 @@
 #. item "Public Transport/Railway Platform" check "Area"
 #. item "Public Transport/Bus Platform" check "Area"
-#: build/trans_presets.java:1580 build/trans_presets.java:1625
+#: build/trans_presets.java:1599 build/trans_presets.java:1644
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1601
 msgid "Subway Entrance"
 msgstr ""
@@ -25693,5 +26045,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:1585
+#: build/trans_presets.java:1604
 msgid "Edit Subway Entrance"
 msgstr ""
@@ -25699,5 +26051,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1590 build/trans_presets.java:2804
+#: build/trans_presets.java:1609 build/trans_presets.java:2899
 msgid "Wheelchair"
 msgstr ""
@@ -25706,5 +26058,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1614
 msgid "Bus Station"
 msgstr ""
@@ -25713,5 +26065,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:1598
+#: build/trans_presets.java:1617
 msgid "Edit Bus Station"
 msgstr ""
@@ -25719,5 +26071,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1604
+#: build/trans_presets.java:1623
 msgid "Bus Stop"
 msgstr ""
@@ -25727,5 +26079,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:1608
+#: build/trans_presets.java:1627
 msgid "Edit Bus Stop"
 msgstr ""
@@ -25734,6 +26086,6 @@
 #. item "Tourism/Shelter"
 #. item "Amenities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1613 build/trans_presets.java:2044
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:1632 build/trans_presets.java:2077
+#: build/trans_presets.java:2964
 msgid "Shelter"
 msgstr ""
@@ -25742,10 +26094,10 @@
 #. <key key="amenity" value="waste_basket" />
 #. item "Amenities/Bench"
-#: build/trans_presets.java:1614 build/trans_presets.java:2857
+#: build/trans_presets.java:1633 build/trans_presets.java:2952
 msgid "Bench"
 msgstr ""
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1634
 msgid "Tactile Paving"
 msgstr ""
@@ -25753,22 +26105,78 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1638
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1639
 msgid "Edit Bus Platform"
 msgstr ""
 
 #. <separator/>
-#. item "Public Transport/Taxi"
-#: build/trans_presets.java:1628
+#. item "Public Transport/Ticket Machine"
+#: build/trans_presets.java:1647
+msgid "Ticket Machine"
+msgstr ""
+
+#. item "Public Transport/Ticket Machine" text "Reference Number"
+#: build/trans_presets.java:1653
+msgid "Reference Number"
+msgstr ""
+
+#. item "Public Transport/Ticket Machine" check "Coins"
+#. item "Amenities/Telephone" check "Coins"
+#. item "Shops/Vending machine" check "Coins"
+#: build/trans_presets.java:1654 build/trans_presets.java:2913
+#: build/trans_presets.java:3390
+msgid "Coins"
+msgstr ""
+
+#. item "Public Transport/Ticket Machine" check "Notes"
+#. item "Amenities/Telephone" check "Notes"
+#. item "Shops/Vending machine" check "Notes"
+#: build/trans_presets.java:1655 build/trans_presets.java:2914
+#: build/trans_presets.java:3391
+msgid "Notes"
+msgstr ""
+
+#. item "Public Transport/Ticket Machine" check "Electronic purses and Charge cards"
+#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
+#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
+#: build/trans_presets.java:1656 build/trans_presets.java:2915
+#: build/trans_presets.java:3392
+msgid "Electronic purses and Charge cards"
+msgstr ""
+
+#. item "Public Transport/Ticket Machine" check "Debit cards"
+#. item "Amenities/Telephone" check "Debit cards"
+#. item "Shops/Vending machine" check "Debit cards"
+#: build/trans_presets.java:1657 build/trans_presets.java:2916
+#: build/trans_presets.java:3393
+msgid "Debit cards"
+msgstr ""
+
+#. item "Public Transport/Ticket Machine" check "Credit cards"
+#. item "Amenities/Telephone" check "Credit cards"
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:1658 build/trans_presets.java:2917
+#: build/trans_presets.java:3394
+msgid "Credit cards"
+msgstr ""
+
+#. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:1659 build/trans_presets.java:3395
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Taxi"
+#: build/trans_presets.java:1662
 msgid "Taxi"
 msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#. item "Public Transport/Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1630
+#. item "Taxi" label "Edit Taxi station"
+#: build/trans_presets.java:1664
 msgid "Edit Taxi station"
 msgstr ""
@@ -25776,10 +26184,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1669
 msgid "Airport"
 msgstr ""
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1670
 msgid "Airport Ground"
 msgstr ""
@@ -25787,5 +26195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1672
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25793,10 +26201,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1676
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1677
 msgid "ICAO"
 msgstr ""
@@ -25805,5 +26213,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1682
 msgid "Runway"
 msgstr ""
@@ -25811,5 +26219,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1684
 msgid "Edit Runway"
 msgstr ""
@@ -25817,5 +26225,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1690
 msgid "Taxiway"
 msgstr ""
@@ -25823,5 +26231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1692
 msgid "Edit Taxiway"
 msgstr ""
@@ -25829,5 +26237,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1698
 msgid "Helipad"
 msgstr ""
@@ -25835,5 +26243,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1700
 msgid "Edit Helipad"
 msgstr ""
@@ -25843,5 +26251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1673 build/trans_presets.java:1675
+#: build/trans_presets.java:1706 build/trans_presets.java:1708
 msgid "Apron"
 msgstr ""
@@ -25851,5 +26259,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1678 build/trans_presets.java:1680
+#: build/trans_presets.java:1711 build/trans_presets.java:1713
 msgid "Hangar"
 msgstr ""
@@ -25860,6 +26268,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Beacon"
-#: build/trans_presets.java:1683 build/trans_presets.java:1685
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:1716 build/trans_presets.java:1718
+#: build/trans_presets.java:2823
 msgid "Beacon"
 msgstr ""
@@ -25869,5 +26277,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1688 build/trans_presets.java:1690
+#: build/trans_presets.java:1721 build/trans_presets.java:1723
 msgid "Windsock"
 msgstr ""
@@ -25876,5 +26284,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1727
 msgid "Terminal"
 msgstr ""
@@ -25882,10 +26290,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1729
 msgid "Edit Terminal"
 msgstr ""
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1733
 msgctxt "airport"
 msgid "Gate"
@@ -25894,15 +26302,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1735
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1741
 msgid "Travel"
 msgstr ""
 
 #. group "Travel/Accomodation"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1742
 msgid "Accomodation"
 msgstr ""
@@ -25914,5 +26322,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1710 build/trans_surveyor.java:43
+#: build/trans_presets.java:1743 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -25921,5 +26329,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Travel/Accomodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1746
 msgid "Edit Hotel"
 msgstr ""
@@ -25933,8 +26341,8 @@
 #. item "Travel/Accomodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1717 build/trans_presets.java:1735
-#: build/trans_presets.java:1751 build/trans_presets.java:1768
-#: build/trans_presets.java:1786 build/trans_presets.java:1820
-#: build/trans_presets.java:1842 build/trans_presets.java:1865
+#: build/trans_presets.java:1750 build/trans_presets.java:1768
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1819 build/trans_presets.java:1853
+#: build/trans_presets.java:1875 build/trans_presets.java:1898
 msgid "Stars"
 msgstr ""
@@ -25970,34 +26378,34 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1719 build/trans_presets.java:1737
-#: build/trans_presets.java:1753 build/trans_presets.java:1770
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1822 build/trans_presets.java:1844
-#: build/trans_presets.java:1867 build/trans_presets.java:1886
-#: build/trans_presets.java:1903 build/trans_presets.java:1922
-#: build/trans_presets.java:1941 build/trans_presets.java:1957
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1752 build/trans_presets.java:1770
+#: build/trans_presets.java:1786 build/trans_presets.java:1803
+#: build/trans_presets.java:1821 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1877
+#: build/trans_presets.java:1900 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1719 build/trans_presets.java:1737
-#: build/trans_presets.java:1753 build/trans_presets.java:1770
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1822 build/trans_presets.java:1844
-#: build/trans_presets.java:1867 build/trans_presets.java:1886
-#: build/trans_presets.java:1903 build/trans_presets.java:1922
-#: build/trans_presets.java:1941 build/trans_presets.java:1957
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1752 build/trans_presets.java:1770
+#: build/trans_presets.java:1786 build/trans_presets.java:1803
+#: build/trans_presets.java:1821 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1877
+#: build/trans_presets.java:1900 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1719 build/trans_presets.java:1737
-#: build/trans_presets.java:1753 build/trans_presets.java:1770
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1822 build/trans_presets.java:1844
-#: build/trans_presets.java:1867 build/trans_presets.java:1886
-#: build/trans_presets.java:1903 build/trans_presets.java:1922
-#: build/trans_presets.java:1941 build/trans_presets.java:1957
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1752 build/trans_presets.java:1770
+#: build/trans_presets.java:1786 build/trans_presets.java:1803
+#: build/trans_presets.java:1821 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1877
+#: build/trans_presets.java:1900 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007
 msgid "wired"
 msgstr ""
@@ -26011,12 +26419,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1719 build/trans_presets.java:1737
-#: build/trans_presets.java:1753 build/trans_presets.java:1770
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1822 build/trans_presets.java:1844
-#: build/trans_presets.java:1867 build/trans_presets.java:1886
-#: build/trans_presets.java:1903 build/trans_presets.java:1922
-#: build/trans_presets.java:1941 build/trans_presets.java:1957
-#: build/trans_presets.java:1974 build/trans_style.java:1413
+#: build/trans_presets.java:1752 build/trans_presets.java:1770
+#: build/trans_presets.java:1786 build/trans_presets.java:1803
+#: build/trans_presets.java:1821 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1877
+#: build/trans_presets.java:1900 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1955
+#: build/trans_presets.java:1974 build/trans_presets.java:1990
+#: build/trans_presets.java:2007 build/trans_style.java:1413
 msgid "terminal"
 msgstr ""
@@ -26037,12 +26445,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1720 build/trans_presets.java:1738
-#: build/trans_presets.java:1754 build/trans_presets.java:1771
-#: build/trans_presets.java:1789 build/trans_presets.java:1806
-#: build/trans_presets.java:1823 build/trans_presets.java:1845
-#: build/trans_presets.java:1868 build/trans_presets.java:1887
-#: build/trans_presets.java:1904 build/trans_presets.java:1923
-#: build/trans_presets.java:1942 build/trans_presets.java:1958
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1753 build/trans_presets.java:1771
+#: build/trans_presets.java:1787 build/trans_presets.java:1804
+#: build/trans_presets.java:1822 build/trans_presets.java:1839
+#: build/trans_presets.java:1856 build/trans_presets.java:1878
+#: build/trans_presets.java:1901 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1956
+#: build/trans_presets.java:1975 build/trans_presets.java:1991
+#: build/trans_presets.java:2008
 msgid "Internet access fee"
 msgstr ""
@@ -26065,50 +26473,50 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1721 build/trans_presets.java:1739
-#: build/trans_presets.java:1755 build/trans_presets.java:1772
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1824 build/trans_presets.java:1846
-#: build/trans_presets.java:1869 build/trans_presets.java:1888
-#: build/trans_presets.java:1905 build/trans_presets.java:1924
-#: build/trans_presets.java:1943 build/trans_presets.java:1959
-#: build/trans_presets.java:1976 build/trans_presets.java:1991
+#: build/trans_presets.java:1754 build/trans_presets.java:1772
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1823 build/trans_presets.java:1840
+#: build/trans_presets.java:1857 build/trans_presets.java:1879
+#: build/trans_presets.java:1902 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1957
+#: build/trans_presets.java:1976 build/trans_presets.java:1992
+#: build/trans_presets.java:2009 build/trans_presets.java:2024
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1721 build/trans_presets.java:1739
-#: build/trans_presets.java:1755 build/trans_presets.java:1772
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1824 build/trans_presets.java:1846
-#: build/trans_presets.java:1869 build/trans_presets.java:1888
-#: build/trans_presets.java:1905 build/trans_presets.java:1924
-#: build/trans_presets.java:1943 build/trans_presets.java:1959
-#: build/trans_presets.java:1976 build/trans_presets.java:1991
+#: build/trans_presets.java:1754 build/trans_presets.java:1772
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1823 build/trans_presets.java:1840
+#: build/trans_presets.java:1857 build/trans_presets.java:1879
+#: build/trans_presets.java:1902 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1957
+#: build/trans_presets.java:1976 build/trans_presets.java:1992
+#: build/trans_presets.java:2009 build/trans_presets.java:2024
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1721 build/trans_presets.java:1739
-#: build/trans_presets.java:1755 build/trans_presets.java:1772
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1824 build/trans_presets.java:1846
-#: build/trans_presets.java:1869 build/trans_presets.java:1888
-#: build/trans_presets.java:1905 build/trans_presets.java:1924
-#: build/trans_presets.java:1943 build/trans_presets.java:1959
-#: build/trans_presets.java:1976 build/trans_presets.java:1991
+#: build/trans_presets.java:1754 build/trans_presets.java:1772
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1823 build/trans_presets.java:1840
+#: build/trans_presets.java:1857 build/trans_presets.java:1879
+#: build/trans_presets.java:1902 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1957
+#: build/trans_presets.java:1976 build/trans_presets.java:1992
+#: build/trans_presets.java:2009 build/trans_presets.java:2024
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1721 build/trans_presets.java:1739
-#: build/trans_presets.java:1755 build/trans_presets.java:1772
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1824 build/trans_presets.java:1846
-#: build/trans_presets.java:1869 build/trans_presets.java:1888
-#: build/trans_presets.java:1905 build/trans_presets.java:1924
-#: build/trans_presets.java:1943 build/trans_presets.java:1959
-#: build/trans_presets.java:1976 build/trans_presets.java:1991
+#: build/trans_presets.java:1754 build/trans_presets.java:1772
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1823 build/trans_presets.java:1840
+#: build/trans_presets.java:1857 build/trans_presets.java:1879
+#: build/trans_presets.java:1902 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1957
+#: build/trans_presets.java:1976 build/trans_presets.java:1992
+#: build/trans_presets.java:2009 build/trans_presets.java:2024
 msgid "isolated"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1762
 msgid "Motel"
 msgstr ""
@@ -26116,20 +26524,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Travel/Accomodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1764
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1780
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1781
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1796
 msgid "Chalet"
 msgstr ""
@@ -26137,10 +26545,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Travel/Accomodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1798
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1813
 msgid "Hostel"
 msgstr ""
@@ -26148,15 +26556,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Travel/Accomodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1815
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1831
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1832
 msgid "Edit Alpine Hut"
 msgstr ""
@@ -26164,10 +26572,10 @@
 #. <separator/>
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1849
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1850
 msgid "Edit Caravan Site"
 msgstr ""
@@ -26175,29 +26583,29 @@
 #. <space />
 #. item "Travel/Accomodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1860
 msgid "Number of places"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1861
 msgid "Requires a fee"
 msgstr ""
 
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1861
 msgid "interval"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1862
 msgid "Power supply"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1863
 msgid "Tents allowed"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1870
 msgid "Camping Site"
 msgstr ""
@@ -26205,10 +26613,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1872
 msgid "Edit Camping Site"
 msgstr ""
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1888
 msgid "Food+Drinks"
 msgstr ""
@@ -26219,5 +26627,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:1856 build/trans_surveyor.java:47
+#: build/trans_presets.java:1889 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -26225,5 +26633,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1891
 msgid "Edit Restaurant"
 msgstr ""
@@ -26232,74 +26640,74 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
+#: build/trans_presets.java:1952
 msgid "Cuisine"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1862 build/trans_presets.java:1883
+#: build/trans_presets.java:1895 build/trans_presets.java:1916
 msgid "sushi"
 msgstr ""
@@ -26307,10 +26715,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1863 build/trans_presets.java:1938
+#: build/trans_presets.java:1896 build/trans_presets.java:1971
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1910
 msgid "Fast Food"
 msgstr ""
@@ -26318,18 +26726,18 @@
 #. <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:1879
+#: build/trans_presets.java:1912
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1916
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1916
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1929
 msgid "Food Court"
 msgstr ""
@@ -26337,10 +26745,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:1898
+#: build/trans_presets.java:1931
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1946
 msgid "Cafe"
 msgstr ""
@@ -26348,14 +26756,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1948
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1952
 msgid "ice_cream"
 msgstr ""
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1965
 msgid "Pub"
 msgstr ""
@@ -26363,20 +26771,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1967
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1984
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1985
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:2000
 msgid "Bar"
 msgstr ""
@@ -26384,10 +26792,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2002
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:2017
 msgid "Nightclub"
 msgstr ""
@@ -26395,25 +26803,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2019
 msgid "Edit Nightclub"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2033
 msgid "Tourism"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2034
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:2035
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Museum"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2040
 msgid "Museum"
 msgstr ""
@@ -26421,10 +26829,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Tourism/Museum" label "Edit Museum"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2042
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Zoo"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2048
 msgid "Zoo"
 msgstr ""
@@ -26433,20 +26841,20 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Tourism/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2051
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2057
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2058
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Artwork"
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2063
 msgid "Artwork"
 msgstr ""
@@ -26454,5 +26862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Tourism/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2065
 msgid "Edit Artwork"
 msgstr ""
@@ -26460,5 +26868,5 @@
 #. <separator/>
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2070
 msgid "Viewpoint"
 msgstr ""
@@ -26466,15 +26874,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2072
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2075
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2078
 msgid "Edit Shelter"
 msgstr ""
@@ -26482,35 +26890,66 @@
 #. item "Tourism/Shelter" check "Fireplace"
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2083
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2084
 msgid "Edit Picnic Site"
 msgstr ""
+
+#. item "Tourism/Public Grill"
+#: build/trans_presets.java:2089
+msgid "Public Grill"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
+#. item "Tourism/Public Grill" label "Edit Public Grill"
+#: build/trans_presets.java:2091
+msgid "Edit Public Grill"
+msgstr ""
+
+#. item "Tourism/Public Grill" combo "Covered"
+#: build/trans_presets.java:2095
+msgid "Covered"
+msgstr ""
+
+#. item "Tourism/Public Grill" combo "Fuel"
+#: build/trans_presets.java:2096
+msgctxt "grill"
+msgid "Fuel"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "charcoal"
+msgstr ""
+
+#: build/trans_presets.java:2096
+#, fuzzy
+msgid "electric"
+msgstr "Selectaţi"
 
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2099
 msgid "Information Office"
 msgstr ""
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2106
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2111
 msgid "Detail Grade"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2111
 msgid "topo"
 msgstr ""
@@ -26550,5 +26989,5 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2069 build/trans_presets.java:3707
+#: build/trans_presets.java:2111 build/trans_presets.java:3990
 #: build/trans_style.java:625 build/trans_style.java:641
 #: build/trans_style.java:657 build/trans_style.java:665
@@ -26556,22 +26995,22 @@
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2111
 msgid "scheme"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2112
 msgid "Shown Area"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2112
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2112
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2112
 msgid "region"
 msgstr ""
@@ -26580,6 +27019,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2071 build/trans_presets.java:2087
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2113 build/trans_presets.java:2129
+#: build/trans_presets.java:2177
 msgid "Closer Description"
 msgstr ""
@@ -26589,5 +27028,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2073 build/trans_presets.java:2096
+#: build/trans_presets.java:2115 build/trans_presets.java:2138
 msgid "Routes shown for:"
 msgstr ""
@@ -26595,5 +27034,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2074 build/trans_presets.java:2097
+#: build/trans_presets.java:2116 build/trans_presets.java:2139
 msgid "Hiking"
 msgstr ""
@@ -26602,6 +27041,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2075 build/trans_presets.java:2098
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2117 build/trans_presets.java:2140
+#: build/trans_presets.java:2362
 msgid "Cycling"
 msgstr ""
@@ -26609,5 +27048,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2076 build/trans_presets.java:2099
+#: build/trans_presets.java:2118 build/trans_presets.java:2141
 msgid "Mountainbiking"
 msgstr ""
@@ -26616,6 +27055,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2077 build/trans_presets.java:2100
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2119 build/trans_presets.java:2142
+#: build/trans_presets.java:2410
 msgid "Skiing"
 msgstr ""
@@ -26623,5 +27062,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2078 build/trans_presets.java:2101
+#: build/trans_presets.java:2120 build/trans_presets.java:2143
 msgid "Riding"
 msgstr ""
@@ -26629,45 +27068,45 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2079 build/trans_presets.java:2102
+#: build/trans_presets.java:2121 build/trans_presets.java:2144
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2123
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2128
 msgid "Board Content"
 msgstr ""
 
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2128
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2128
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2128
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2128
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2128
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2131
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Flagpole"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2146
 msgid "Flagpole"
 msgstr ""
@@ -26676,5 +27115,5 @@
 #. <key key="man_made" value="flagpole" />
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2150
 msgid "Information Terminal"
 msgstr ""
@@ -26682,10 +27121,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2113 build/trans_presets.java:2123
+#: build/trans_presets.java:2155 build/trans_presets.java:2165
 msgid "Closer description"
 msgstr ""
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2160
 msgid "Audioguide"
 msgstr ""
@@ -26693,25 +27132,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2170
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2171
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2173
 msgid "Other Information Points"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2180
 msgid "Historic Places"
 msgstr ""
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2181
 msgid "Castle"
 msgstr ""
@@ -26720,20 +27159,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2184
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2189
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2190
 msgid "Edit Ruins"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2195
 msgid "Archaeological Site"
 msgstr ""
@@ -26742,10 +27181,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:2156
+#: build/trans_presets.java:2198
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2203
 msgid "Battlefield"
 msgstr ""
@@ -26753,10 +27192,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2205
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2209
 msgid "Palaeontological Site"
 msgstr ""
@@ -26764,5 +27203,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2211
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -26770,15 +27209,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2216
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2217
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2221
 msgid "Memorial"
 msgstr ""
@@ -26786,55 +27225,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2223
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2227
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2228
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2232
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2233
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2237
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2238
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2243
 msgid "Leisure"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2244
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2245
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2249
 msgid "Playground"
 msgstr ""
@@ -26842,36 +27281,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2251
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2255
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2256
 msgid "Edit Fishing"
+msgstr ""
+
+#. item "Leisure/Sauna"
+#: build/trans_presets.java:2260
+msgid "Sauna"
+msgstr ""
+
+#. item "Leisure/Sauna" label "Edit Sauna"
+#. <space />
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
+#. item "Leisure/Sauna" label "Edit Sauna"
+#: build/trans_presets.java:2261 build/trans_presets.java:2264
+msgid "Edit Sauna"
+msgstr ""
+
+#: build/trans_presets.java:2269 build/trans_presets.java:3038
+#: build/trans_presets.java:3047 build/trans_presets.java:3056
+#: build/trans_presets.java:3065 build/trans_presets.java:3113
+#: build/trans_presets.java:3122 build/trans_presets.java:3131
+#: build/trans_presets.java:3141 build/trans_presets.java:3150
+#: build/trans_presets.java:3166 build/trans_presets.java:3214
+#: build/trans_presets.java:3236 build/trans_presets.java:3245
+#: build/trans_presets.java:3288 build/trans_presets.java:3310
+#: build/trans_presets.java:3319 build/trans_presets.java:3328
+#: build/trans_presets.java:3343 build/trans_presets.java:3364
+#: build/trans_presets.java:3379
+msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+#. item "Leisure/Sauna" combo "Zugang"
+#: build/trans_presets.java:2270
+msgid "Zugang"
 msgstr ""
 
 #. group "Sports"
 #. item "Shops/Sports"
-#: build/trans_presets.java:2220 build/trans_presets.java:2988
+#: build/trans_presets.java:2274 build/trans_presets.java:3181
 msgid "Sports"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2275
 msgid "Sport Facilities"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2276
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2277
 msgid "Edit Stadium"
 msgstr ""
@@ -26885,6 +27356,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2227 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2254
+#: build/trans_presets.java:2281 build/trans_presets.java:2290
+#: build/trans_presets.java:2299 build/trans_presets.java:2308
 msgid "select sport:"
 msgstr ""
@@ -27348,279 +27819,279 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
-#: build/trans_style.java:3831 build/trans_style.java:3839
-#: build/trans_style.java:3847 build/trans_style.java:3855
-#: build/trans_style.java:3863 build/trans_style.java:3871
-#: build/trans_style.java:3879 build/trans_style.java:3887
-#: build/trans_style.java:3895 build/trans_style.java:3903
-#: build/trans_style.java:3911 build/trans_style.java:3919
-#: build/trans_style.java:3927 build/trans_style.java:3935
-#: build/trans_style.java:3943 build/trans_style.java:3951
-#: build/trans_style.java:3959 build/trans_style.java:3967
-#: build/trans_style.java:3975 build/trans_style.java:3983
-#: build/trans_style.java:3991 build/trans_style.java:3999
-#: build/trans_style.java:4007 build/trans_style.java:4015
-#: build/trans_style.java:4023 build/trans_style.java:4031
-#: build/trans_style.java:4039 build/trans_style.java:4047
-#: build/trans_style.java:4055 build/trans_style.java:4063
-#: build/trans_style.java:4071 build/trans_style.java:4079
-#: build/trans_style.java:4087 build/trans_style.java:4095
-#: build/trans_style.java:4103 build/trans_style.java:4111
-#: build/trans_style.java:4119 build/trans_style.java:4127
-#: build/trans_style.java:4135 build/trans_style.java:4143
-#: build/trans_style.java:4151 build/trans_style.java:4159
-#: build/trans_style.java:4167 build/trans_style.java:4175
-#: build/trans_style.java:4183 build/trans_style.java:4191
-#: build/trans_style.java:4199 build/trans_style.java:4207
-#: build/trans_style.java:4215 build/trans_style.java:4223
-#: build/trans_style.java:4231 build/trans_style.java:4239
-#: build/trans_style.java:4247 build/trans_style.java:4255
-#: build/trans_style.java:4263 build/trans_style.java:4271
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
+#: build/trans_style.java:4015 build/trans_style.java:4023
+#: build/trans_style.java:4031 build/trans_style.java:4039
+#: build/trans_style.java:4047 build/trans_style.java:4055
+#: build/trans_style.java:4063 build/trans_style.java:4071
+#: build/trans_style.java:4079 build/trans_style.java:4087
+#: build/trans_style.java:4095 build/trans_style.java:4103
+#: build/trans_style.java:4111 build/trans_style.java:4119
+#: build/trans_style.java:4127 build/trans_style.java:4135
+#: build/trans_style.java:4143 build/trans_style.java:4151
+#: build/trans_style.java:4159 build/trans_style.java:4167
+#: build/trans_style.java:4175 build/trans_style.java:4183
+#: build/trans_style.java:4191 build/trans_style.java:4199
+#: build/trans_style.java:4207 build/trans_style.java:4215
+#: build/trans_style.java:4223 build/trans_style.java:4231
+#: build/trans_style.java:4239 build/trans_style.java:4247
+#: build/trans_style.java:4255 build/trans_style.java:4263
+#: build/trans_style.java:4271 build/trans_style.java:4279
+#: build/trans_style.java:4287 build/trans_style.java:4295
+#: build/trans_style.java:4303 build/trans_style.java:4311
+#: build/trans_style.java:4319 build/trans_style.java:4327
+#: build/trans_style.java:4335 build/trans_style.java:4343
+#: build/trans_style.java:4351 build/trans_style.java:4359
+#: build/trans_style.java:4367 build/trans_style.java:4375
+#: build/trans_style.java:4383 build/trans_style.java:4391
+#: build/trans_style.java:4399 build/trans_style.java:4407
+#: build/trans_style.java:4415 build/trans_style.java:4423
+#: build/trans_style.java:4431 build/trans_style.java:4439
+#: build/trans_style.java:4447 build/trans_style.java:4455
 msgid "sport"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2238
-#: build/trans_presets.java:2247 build/trans_presets.java:2256
+#: build/trans_presets.java:2283 build/trans_presets.java:2292
+#: build/trans_presets.java:2301 build/trans_presets.java:2310
 msgid "tennis"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2285
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2286
 msgid "Edit Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2294
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2295
 msgid "Edit Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2303
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2304
 msgid "Edit Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2312
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2313
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2318
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2319
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2325
 msgid "Sport"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2326
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2327
 msgid "Edit Multi"
 msgstr ""
@@ -27668,244 +28139,244 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2276 build/trans_presets.java:2282
-#: build/trans_presets.java:2288 build/trans_presets.java:2294
-#: build/trans_presets.java:2300 build/trans_presets.java:2306
-#: build/trans_presets.java:2312 build/trans_presets.java:2318
-#: build/trans_presets.java:2324 build/trans_presets.java:2330
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2363 build/trans_presets.java:2370
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
 #: build/trans_presets.java:2378 build/trans_presets.java:2384
 #: build/trans_presets.java:2390 build/trans_presets.java:2396
 #: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2414 build/trans_presets.java:2420
-#: build/trans_presets.java:2426 build/trans_presets.java:2432
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2450 build/trans_presets.java:2456
-#: build/trans_presets.java:2462 build/trans_presets.java:2468
-#: build/trans_presets.java:2474 build/trans_presets.java:2480
-#: build/trans_presets.java:2486 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2506
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2525 build/trans_presets.java:2531
+#: build/trans_presets.java:2417 build/trans_presets.java:2424
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2504 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2579 build/trans_presets.java:2585
 msgid "type"
 msgstr ""
 
-#: build/trans_presets.java:2276 build/trans_presets.java:2282
-#: build/trans_presets.java:2288 build/trans_presets.java:2294
-#: build/trans_presets.java:2300 build/trans_presets.java:2306
-#: build/trans_presets.java:2312 build/trans_presets.java:2318
-#: build/trans_presets.java:2324 build/trans_presets.java:2330
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2363 build/trans_presets.java:2370
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
 #: build/trans_presets.java:2378 build/trans_presets.java:2384
 #: build/trans_presets.java:2390 build/trans_presets.java:2396
 #: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2414 build/trans_presets.java:2420
-#: build/trans_presets.java:2426 build/trans_presets.java:2432
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2450 build/trans_presets.java:2456
-#: build/trans_presets.java:2462 build/trans_presets.java:2468
-#: build/trans_presets.java:2474 build/trans_presets.java:2480
-#: build/trans_presets.java:2486 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2506
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2525 build/trans_presets.java:2531
+#: build/trans_presets.java:2417 build/trans_presets.java:2424
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2504 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2579 build/trans_presets.java:2585
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2276 build/trans_presets.java:2282
-#: build/trans_presets.java:2288 build/trans_presets.java:2294
-#: build/trans_presets.java:2300 build/trans_presets.java:2306
-#: build/trans_presets.java:2312 build/trans_presets.java:2318
-#: build/trans_presets.java:2324 build/trans_presets.java:2330
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2363 build/trans_presets.java:2370
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
 #: build/trans_presets.java:2378 build/trans_presets.java:2384
 #: build/trans_presets.java:2390 build/trans_presets.java:2396
 #: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2414 build/trans_presets.java:2420
-#: build/trans_presets.java:2426 build/trans_presets.java:2432
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2450 build/trans_presets.java:2456
-#: build/trans_presets.java:2462 build/trans_presets.java:2468
-#: build/trans_presets.java:2474 build/trans_presets.java:2480
-#: build/trans_presets.java:2486 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2506
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2525 build/trans_presets.java:2531
+#: build/trans_presets.java:2417 build/trans_presets.java:2424
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2504 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2579 build/trans_presets.java:2585
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:2276 build/trans_presets.java:2282
-#: build/trans_presets.java:2288 build/trans_presets.java:2294
-#: build/trans_presets.java:2300 build/trans_presets.java:2306
-#: build/trans_presets.java:2312 build/trans_presets.java:2318
-#: build/trans_presets.java:2324 build/trans_presets.java:2330
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2363 build/trans_presets.java:2370
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
 #: build/trans_presets.java:2378 build/trans_presets.java:2384
 #: build/trans_presets.java:2390 build/trans_presets.java:2396
 #: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2414 build/trans_presets.java:2420
-#: build/trans_presets.java:2426 build/trans_presets.java:2432
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2450 build/trans_presets.java:2456
-#: build/trans_presets.java:2462 build/trans_presets.java:2468
-#: build/trans_presets.java:2474 build/trans_presets.java:2480
-#: build/trans_presets.java:2486 build/trans_presets.java:2492
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2417 build/trans_presets.java:2424
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2504 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2554
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:2276 build/trans_presets.java:2282
-#: build/trans_presets.java:2288 build/trans_presets.java:2294
-#: build/trans_presets.java:2300 build/trans_presets.java:2306
-#: build/trans_presets.java:2312 build/trans_presets.java:2318
-#: build/trans_presets.java:2324 build/trans_presets.java:2330
-#: build/trans_presets.java:2336 build/trans_presets.java:2342
-#: build/trans_presets.java:2348 build/trans_presets.java:2354
-#: build/trans_presets.java:2363 build/trans_presets.java:2370
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
 #: build/trans_presets.java:2378 build/trans_presets.java:2384
 #: build/trans_presets.java:2390 build/trans_presets.java:2396
 #: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2414 build/trans_presets.java:2420
-#: build/trans_presets.java:2426 build/trans_presets.java:2432
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2450 build/trans_presets.java:2456
-#: build/trans_presets.java:2462 build/trans_presets.java:2468
-#: build/trans_presets.java:2474 build/trans_presets.java:2480
-#: build/trans_presets.java:2486 build/trans_presets.java:2492
-#: build/trans_presets.java:2500 build/trans_presets.java:2506
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2525 build/trans_presets.java:2531
+#: build/trans_presets.java:2417 build/trans_presets.java:2424
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2504 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2579 build/trans_presets.java:2585
 msgid "track"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2332
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2333
 msgid "Edit 10pin"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2338
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2339
 msgid "Edit Athletics"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2344
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2345
 msgid "Edit Archery"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2350
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2351
 msgid "Edit Climbing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2356
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2357
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2363
 msgid "Edit Cycling"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2368
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2369
 msgid "Edit Dog Racing"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2374
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2375
 msgid "Edit Equestrian"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2380
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2381
 msgid "Edit Horse Racing"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2386
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2387
 msgid "Edit Gymnastics"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2392
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2393
 msgid "Edit Skating"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2398
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2399
 msgid "Edit Skateboard"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2404
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2405
 msgid "Edit Swimming"
 msgstr ""
@@ -27913,52 +28384,52 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2412
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2415
 msgid "Piste type"
 msgstr ""
 
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2415
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2415
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2415
 msgid "snow_park"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2416
 msgid "Difficulty"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2416
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2416
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2416
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2416
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2416
 msgid "freeride"
 msgstr ""
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2419
 msgid "Shooting"
 msgstr ""
@@ -27966,214 +28437,214 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2421
 msgid "Edit Shooting"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2427
 msgid "Sport (Ball)"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2428
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2429
 msgid "Edit Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2434
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2435
 msgid "Edit Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2440
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2441
 msgid "Edit American Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2446
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2447
 msgid "Edit Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2452
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2453
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2458
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2459
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2464
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2465
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2470
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2471
 msgid "Edit Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2476
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2477
 msgid "Edit Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2482
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2483
 msgid "Edit Golf"
 msgstr ""
 
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2486
 msgid "golf_course"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2488
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2489
 msgid "Edit Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2494
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2495
 msgid "Edit Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2500
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2501
 msgid "Edit Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2506
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2507
 msgid "Edit Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2512
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2513
 msgid "Edit Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2518
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2519
 msgid "Edit Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2524
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2525
 msgid "Edit Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2530
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2531
 msgid "Edit Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2536
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2537
 msgid "Edit Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2542
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2543
 msgid "Edit Tennis"
 msgstr ""
@@ -28181,40 +28652,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2495 build/trans_presets.java:2496
+#: build/trans_presets.java:2549 build/trans_presets.java:2550
 msgid "Motorsport"
 msgstr ""
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2551
 msgid "Edit Motorsport"
 msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2556
 msgid "Karting"
 msgstr ""
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2557
 msgid "Edit Karting"
 msgstr ""
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2562
 msgid "Motocross"
 msgstr ""
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2563
 msgid "Edit Motocross"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2568
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2569
 msgid "Edit Safety Training"
 msgstr ""
@@ -28222,30 +28693,30 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2575
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2576
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2581
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2582
 msgid "Edit RC Car"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2589
 msgid "Man-Made"
 msgstr ""
 
 #. item "Man-Made/Buildings/Building"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2591
 msgid "Building"
 msgstr ""
@@ -28253,5 +28724,5 @@
 #. <key key="building" value="yes" />
 #. item "Man-Made/Buildings/Public Building"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2594
 msgid "Public Building"
 msgstr ""
@@ -28259,10 +28730,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2596
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2600
 msgid "Town hall"
 msgstr ""
@@ -28270,10 +28741,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2602
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2606
 msgid "Embassy"
 msgstr ""
@@ -28281,10 +28752,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2608
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2612
 msgid "Courthouse"
 msgstr ""
@@ -28293,10 +28764,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2615
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2619
 msgid "Prison"
 msgstr ""
@@ -28305,10 +28776,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Man-Made/Buildings/Prison" label "Edit Prison"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2622
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2626
 msgid "Police"
 msgstr ""
@@ -28318,10 +28789,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Man-Made/Buildings/Police" label "Edit Police"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2630
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station"
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2634
 msgid "Fire Station"
 msgstr ""
@@ -28330,10 +28801,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2637
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Post Office"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2641
 msgid "Post Office"
 msgstr ""
@@ -28341,21 +28812,46 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2643
 msgid "Edit Post Office"
 msgstr ""
+
+#. item "Man-Made/Buildings/Studio"
+#: build/trans_presets.java:2648
+msgid "Studio"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
+#. item "Man-Made/Buildings/Studio" label "Edit Studio"
+#: build/trans_presets.java:2650
+msgid "Edit Studio"
+msgstr ""
+
+#: build/trans_presets.java:2655
+msgid "audio"
+msgstr ""
+
+#: build/trans_presets.java:2655
+msgid "video"
+msgstr ""
+
+#. item "Man-Made/Buildings/Studio" text "Phone"
+#: build/trans_presets.java:2656
+#, fuzzy
+msgid "Phone"
+msgstr "nici unul"
 
 #. <separator/>
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2660
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2661
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/School"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2665
 msgid "School"
 msgstr ""
@@ -28363,10 +28859,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Man-Made/Buildings/School" label "Edit School"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2667
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/University"
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2671
 msgid "University"
 msgstr ""
@@ -28374,10 +28870,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Man-Made/Buildings/University" label "Edit University"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2673
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/College"
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2677
 msgid "College"
 msgstr ""
@@ -28385,11 +28881,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Man-Made/Buildings/College" label "Edit College"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2679
 msgid "Edit College"
 msgstr ""
+
+#. item "Man-Made/Buildings/Driving School"
+#: build/trans_presets.java:2683
+msgid "Driving School"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
+#. item "Man-Made/Buildings/Driving School" label "Edit Driving School"
+#: build/trans_presets.java:2685
+msgid "Edit Driving School"
+msgstr ""
+
+#. item "Man-Made/Buildings/Driving School" text "License Classes"
+#: build/trans_presets.java:2690
+#, fuzzy
+msgid "License Classes"
+msgstr "Licență"
 
 #. <separator/>
 #. item "Man-Made/Buildings/Cinema"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2693
 msgid "Cinema"
 msgstr ""
@@ -28398,10 +28911,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2696
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Library"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2700
 msgid "Library"
 msgstr ""
@@ -28410,10 +28923,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Man-Made/Buildings/Library" label "Edit Library"
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2703
 msgid "Edit Library"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2708
 msgid "Arts Centre"
 msgstr ""
@@ -28421,10 +28934,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2710
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2714
 msgid "Theatre"
 msgstr ""
@@ -28433,10 +28946,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2717
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Place of Worship"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2721
 msgid "Place of Worship"
 msgstr ""
@@ -28446,5 +28959,5 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2725
 msgid "Edit Place of Worship"
 msgstr ""
@@ -28453,66 +28966,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "Religion"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2654 build/trans_presets.java:3503
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:2728 build/trans_presets.java:3786
+#: build/trans_presets.java:3795
 msgid "zoroastrian"
 msgstr ""
@@ -28521,119 +29034,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "Denomination"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2655 build/trans_presets.java:3504
-#: build/trans_presets.java:3513
+#: build/trans_presets.java:2729 build/trans_presets.java:3787
+#: build/trans_presets.java:3796
 msgid "sunni"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2733
 msgid "Man Made"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2734
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2735
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2739
 msgid "Tower"
 msgstr ""
 
 #. item "Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2740
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2743
 msgid "Tower type"
 msgstr ""
 
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2743
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2743
 msgid "observation"
 msgstr ""
@@ -28641,31 +29154,43 @@
 #. <optional>
 #. item "Man Made/Tower" text "Height (meters)"
-#: build/trans_presets.java:2671
+#. item "Man Made/Chimney" text "Height (meters)"
+#: build/trans_presets.java:2745 build/trans_presets.java:2756
 msgid "Height (meters)"
 msgstr ""
 
 #. </optional>
+#. item "Man Made/Chimney"
+#: build/trans_presets.java:2749
+msgid "Chimney"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
+#. item "Man Made/Chimney" label "Edit Chimney"
+#: build/trans_presets.java:2751
+msgid "Edit Chimney"
+msgstr ""
+
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2758
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2759
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2763
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2764
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Lighthouse"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2768
 msgid "Lighthouse"
 msgstr ""
@@ -28673,10 +29198,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2770
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Windmill"
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2774
 msgid "Windmill"
 msgstr ""
@@ -28684,10 +29209,21 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2776
 msgid "Edit Windmill"
 msgstr ""
 
+#. item "Man Made/Watermill"
+#: build/trans_presets.java:2780
+msgid "Watermill"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
+#. item "Man Made/Watermill" label "Edit Watermill"
+#: build/trans_presets.java:2782
+msgid "Edit Watermill"
+msgstr ""
+
 #. item "Man Made/Pipeline"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2787
 msgid "Pipeline"
 msgstr ""
@@ -28696,43 +29232,43 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2790
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2703 build/trans_presets.java:2754
+#: build/trans_presets.java:2793 build/trans_presets.java:2849
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2793
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2793
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2793
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2793
 msgid "any substance"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2794
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2794
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2794
 msgid "overground"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2796
 msgid "Wastewater Plant"
 msgstr ""
@@ -28742,10 +29278,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2800
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Crane"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2804
 msgid "Crane"
 msgstr ""
@@ -28753,32 +29289,135 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2806
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Mineshaft"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2810
 msgid "Mineshaft"
 msgstr ""
 
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft" />
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2813
 msgid "Edit Mineshaft"
 msgstr ""
 
+#. item "Man Made/Mineshaft" combo "Function"
+#: build/trans_presets.java:2816
+msgid "Function"
+msgstr ""
+
+#: build/trans_presets.java:2816
+msgid "winding"
+msgstr ""
+
+#: build/trans_presets.java:2816
+msgid "air"
+msgstr ""
+
 #. item "Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2817
 msgid "Depth in meters"
+msgstr ""
+
+#. item "Man Made/Mineshaft" combo "Resource"
+#: build/trans_presets.java:2819
+#, fuzzy
+msgid "Resource"
+msgstr "Rezolvă"
+
+#: build/trans_presets.java:2819
+msgid "aggregate"
+msgstr ""
+
+#: build/trans_presets.java:2819
+msgid "bauxite"
+msgstr ""
+
+#: build/trans_presets.java:2819 build/trans_presets.java:2849
+msgid "coal"
+msgstr ""
+
+#: build/trans_presets.java:2819
+msgid "copper"
+msgstr ""
+
+#: build/trans_presets.java:2819
+msgid "dimension_stone"
+msgstr ""
+
+#: build/trans_presets.java:2819
+msgid "gold"
+msgstr ""
+
+#: build/trans_presets.java:2819
+msgid "ilmenite"
+msgstr ""
+
+#: build/trans_presets.java:2819
+msgid "iron_ore"
+msgstr ""
+
+#: build/trans_presets.java:2819
+#, fuzzy
+msgid "lead"
+msgstr "Citeşte-mă"
+
+#: build/trans_presets.java:2819
+msgid "limestone"
+msgstr ""
+
+#: build/trans_presets.java:2819
+#, fuzzy
+msgid "nickel"
+msgstr "Anulează"
+
+#: build/trans_presets.java:2819
+msgid "rutile"
+msgstr ""
+
+#: build/trans_presets.java:2819
+#, fuzzy
+msgid "salt"
+msgstr "scală"
+
+#: build/trans_presets.java:2819
+#, fuzzy
+msgid "silver"
+msgstr "Rezolvă"
+
+#: build/trans_presets.java:2819
+#, fuzzy
+msgid "tin"
+msgstr "şir"
+
+#: build/trans_presets.java:2819
+msgid "zinc"
+msgstr ""
+
+#: build/trans_presets.java:2819
+msgid "zircon"
+msgstr ""
+
+#. item "Man Made/Mineshaft" combo "Visible Headframe"
+#: build/trans_presets.java:2820
+msgid "Visible Headframe"
+msgstr ""
+
+#. item "Man Made/Mineshaft" check "Mineshaft Disused"
+#: build/trans_presets.java:2821
+msgid "Mineshaft Disused"
 msgstr ""
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2825
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Survey Point"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2829
 msgid "Survey Point"
 msgstr ""
@@ -28786,10 +29425,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2831
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Surveillance"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2835
 msgid "Surveillance"
 msgstr ""
@@ -28797,17 +29436,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2837
 msgid "Edit Surveillance Camera"
 msgstr ""
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2840
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2840
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2840
 msgid "public"
 msgstr ""
@@ -28815,5 +29454,5 @@
 #. <separator/>
 #. item "Man Made/Power Generator"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2843
 msgid "Power Generator"
 msgstr ""
@@ -28823,34 +29462,30 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Man Made/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2847
 msgid "Edit Power Generator"
 msgstr ""
 
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2849
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2849
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2849
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2849
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2754
-msgid "coal"
-msgstr ""
-
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2849
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Station"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2852
 msgid "Power Station"
 msgstr ""
@@ -28859,10 +29494,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Man Made/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2855
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Sub Station"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2861
 msgid "Power Sub Station"
 msgstr ""
@@ -28871,5 +29506,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2864
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -28877,10 +29512,10 @@
 #. item "Man Made/Power Sub Station" text "Line reference"
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2772 build/trans_presets.java:2789
+#: build/trans_presets.java:2867 build/trans_presets.java:2884
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Tower"
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2869
 msgid "Power Tower"
 msgstr ""
@@ -28891,23 +29526,23 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2874
 msgid "Edit Power Tower"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2875
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2780 build/trans_presets.java:2832
+#: build/trans_presets.java:2875 build/trans_presets.java:2927
 msgid "pole"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2876
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Line"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2878
 msgid "Power Line"
 msgstr ""
@@ -28916,19 +29551,19 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2881
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2882
 msgid "Line type"
 msgstr ""
 
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2882
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2882
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28936,40 +29571,40 @@
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2887
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2888
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2888
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2888
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2888
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2888
 msgid "quad"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2891
 msgid "Amenities"
 msgstr ""
 
 #. item "Amenities/Toilets"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2892
 msgid "Toilets"
 msgstr ""
 
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2899
 msgid "limited"
 msgstr ""
@@ -28977,15 +29612,15 @@
 #. item "Amenities/Toilets" text "Note"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2805 build/trans_presets.java:3106
+#: build/trans_presets.java:2900 build/trans_presets.java:3389
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Post Box"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2902
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Telephone"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2907
 msgid "Telephone"
 msgstr ""
@@ -28994,45 +29629,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Amenities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2910
 msgid "Edit Telephone"
 msgstr ""
 
-#. item "Amenities/Telephone" check "Coins"
-#. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2818 build/trans_presets.java:3107
-msgid "Coins"
-msgstr ""
-
-#. item "Amenities/Telephone" check "Notes"
-#. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2819 build/trans_presets.java:3108
-msgid "Notes"
-msgstr ""
-
-#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
-#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2820 build/trans_presets.java:3109
-msgid "Electronic purses and Charge cards"
-msgstr ""
-
-#. item "Amenities/Telephone" check "Debit cards"
-#. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2821 build/trans_presets.java:3110
-msgid "Debit cards"
-msgstr ""
-
-#. item "Amenities/Telephone" check "Credit cards"
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2822 build/trans_presets.java:3111
-msgid "Credit cards"
-msgstr ""
-
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2918
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Clock"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2920
 msgid "Clock"
 msgstr ""
@@ -29041,5 +29646,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Amenities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2923
 msgid "Edit Clock"
 msgstr ""
@@ -29048,71 +29653,71 @@
 #. <optional>
 #. item "Amenities/Clock" combo "Display"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2926
 msgid "Display"
 msgstr ""
 
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2926
 msgid "analog"
 msgstr ""
 
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2926
 msgid "digital"
 msgstr ""
 
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2926
 msgid "sundial"
 msgstr ""
 
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2926
 msgid "unorthodox"
 msgstr ""
 
 #. item "Amenities/Clock" combo "Support"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2927
 msgid "Support"
 msgstr ""
 
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2927
 msgid "wall_mounted"
 msgstr ""
 
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2927
 msgid "billboard"
 msgstr ""
 
 #. item "Amenities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2928
 msgid "Visibility/readability"
 msgstr ""
 
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2928
 msgid "(up to 5m)"
 msgstr ""
 
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2928
 msgid "(up to 20m)"
 msgstr ""
 
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2928
 msgid "(more than 20m)"
 msgstr ""
 
 #. item "Amenities/Clock" check "Shows current date"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2929
 msgid "Shows current date"
 msgstr ""
 
 #. item "Amenities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2930
 msgid "Shows temperature"
 msgstr ""
 
 #. item "Amenities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2931
 msgid "Shows barometric pressure"
 msgstr ""
 
 #. item "Amenities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2932
 msgid "Shows humidity"
 msgstr ""
@@ -29120,5 +29725,5 @@
 #. </optional>
 #. item "Amenities/Recycling"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2935
 msgid "Recycling"
 msgstr ""
@@ -29127,5 +29732,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Amenities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2938
 msgid "Edit Recycling station"
 msgstr ""
@@ -29133,30 +29738,30 @@
 #. <key key="amenity" value="recycling" />
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2940
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2941
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2943
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2944
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2945
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Waste Basket"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2947
 msgid "Waste Basket"
 msgstr ""
@@ -29164,5 +29769,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2949
 msgid "Edit Waste Basket"
 msgstr ""
@@ -29171,31 +29776,31 @@
 #. <key key="amenity" value="bench" />
 #. item "Amenities/Bench" combo "Backrest"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2955
 msgid "Backrest"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2956
 msgid "Material"
 msgstr ""
 
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2956
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2956
 msgid "plastic"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2957
 msgid "Colour"
 msgstr ""
 
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2957
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2957
 msgid "brown"
 msgstr ""
@@ -29274,40 +29879,40 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2862 build/trans_style.java:3283
-#: build/trans_style.java:3291 build/trans_style.java:3299
-#: build/trans_style.java:3307 build/trans_style.java:3315
-#: build/trans_style.java:3362 build/trans_style.java:3370
-#: build/trans_style.java:3468 build/trans_style.java:3476
+#: build/trans_presets.java:2957 build/trans_style.java:3467
+#: build/trans_style.java:3475 build/trans_style.java:3483
+#: build/trans_style.java:3491 build/trans_style.java:3499
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3652 build/trans_style.java:3660
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2957
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2957
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2957
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2957
 msgid "white"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2958
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2960
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2961
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -29316,32 +29921,32 @@
 #. item "Amenities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2868 build/trans_presets.java:3372
+#: build/trans_presets.java:2963 build/trans_presets.java:3655
 msgid "Height"
 msgstr ""
 
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:2963
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:2963
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:2963
 msgid "full"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2965
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2966
 msgid "Lock"
 msgstr ""
 
 #. item "Amenities/Fountain"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2968
 msgid "Fountain"
 msgstr ""
@@ -29350,10 +29955,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Amenities/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2971
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Drinking Water"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2975
 msgid "Drinking Water"
 msgstr ""
@@ -29362,10 +29967,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2978
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Fire Hydrant"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2982
 msgid "Fire Hydrant"
 msgstr ""
@@ -29374,5 +29979,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2985
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -29380,20 +29985,20 @@
 #. <key key="amenity" value="fire_hydrant" />
 #. group "Food"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2989
 msgid "Food"
 msgstr ""
 
 #. item "Food/Supermarket"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2990
 msgid "Supermarket"
 msgstr ""
 
 #. item "Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2991
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Food/Convenience Store"
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:2996
 msgid "Convenience Store"
 msgstr ""
@@ -29401,10 +30006,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2998
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Food/Kiosk"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:3003
 msgid "Kiosk"
 msgstr ""
@@ -29412,10 +30017,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3005
 msgid "Edit Kiosk"
 msgstr ""
 
+#. item "Food/Confectionery"
+#: build/trans_presets.java:3010
+#, fuzzy
+msgid "Confectionery"
+msgstr "Continuă"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
+#. item "Food/Confectionery" label "Edit Confectionery"
+#: build/trans_presets.java:3012
+msgid "Edit Confectionery"
+msgstr ""
+
+#. item "Food/Baker"
+#: build/trans_presets.java:3017
+msgid "Baker"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#. item "Food/Baker" label "Edit Baker"
+#: build/trans_presets.java:3019
+msgid "Edit Baker"
+msgstr ""
+
 #. item "Food/Butcher"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3024
 msgid "Butcher"
 msgstr ""
@@ -29423,31 +30051,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:3026
 msgid "Edit Butcher"
 msgstr ""
 
-#. item "Food/Baker"
-#: build/trans_presets.java:2922
-msgid "Baker"
-msgstr ""
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#. item "Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:2924
-msgid "Edit Baker"
+#. item "Food/Seafood"
+#: build/trans_presets.java:3031
+msgid "Seafood"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
+#. item "Food/Seafood" label "Edit Seafood"
+#: build/trans_presets.java:3033
+msgid "Edit Seafood"
+msgstr ""
+
+#. item "Food/Deli (Fine Food)"
+#: build/trans_presets.java:3040
+msgid "Deli (Fine Food)"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
+#. item "Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
+#: build/trans_presets.java:3042
+msgid "Edit Deli (Fine Food)"
+msgstr ""
+
+#. item "Food/Marketplace"
+#: build/trans_presets.java:3049
+msgid "Marketplace"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
+#. item "Food/Marketplace" label "Edit Marketplace"
+#: build/trans_presets.java:3051
+msgid "Edit Marketplace"
+msgstr ""
+
+#. item "Food/Greengrocer"
+#: build/trans_presets.java:3058
+msgid "Greengrocer"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
+#. item "Food/Greengrocer" label "Edit Greengrocer"
+#: build/trans_presets.java:3060
+msgid "Edit Greengrocer"
 msgstr ""
 
 #. item "Food/Organic"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3067
 msgid "Organic"
 msgstr ""
 
 #. item "Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3068
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Food/Alcohol"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:3073
 msgid "Alcohol"
 msgstr ""
@@ -29455,70 +30116,139 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:3075
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Food/Beverages"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3080
 msgid "Beverages"
 msgstr ""
 
 #. item "Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3081
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:3087
 msgid "Shops"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:3088
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3089
 msgid "Edit Chemist"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3094
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3095
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:3100
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician" label "Edit Optician"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3101
 msgid "Edit Optician"
 msgstr ""
 
+#. item "Shops/Hearing Aids"
+#: build/trans_presets.java:3106
+msgid "Hearing Aids"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
+#. item "Shops/Hearing Aids" label "Edit Hearing Aids"
+#: build/trans_presets.java:3108
+msgid "Edit Hearing Aids"
+msgstr ""
+
+#. item "Shops/Jewelry"
+#: build/trans_presets.java:3115
+msgid "Jewelry"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
+#. item "Shops/Jewelry" label "Edit Jewelry"
+#: build/trans_presets.java:3117
+msgid "Edit Jewelry"
+msgstr ""
+
+#. item "Shops/Erotic"
+#: build/trans_presets.java:3124
+msgid "Erotic"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
+#. item "Shops/Erotic" label "Edit Erotic"
+#: build/trans_presets.java:3126
+msgid "Edit Erotic"
+msgstr ""
+
+#. <separator/>
+#. item "Shops/Department Store"
+#: build/trans_presets.java:3134
+msgid "Department Store"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
+#. item "Shops/Department Store" label "Edit Department Store"
+#: build/trans_presets.java:3136
+msgid "Edit Department Store"
+msgstr ""
+
+#. item "Shops/Mall"
+#: build/trans_presets.java:3143
+msgid "Mall"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
+#. item "Shops/Mall" label "Edit Mall"
+#: build/trans_presets.java:3145
+#, fuzzy
+msgid "Edit Mall"
+msgstr "Editare"
+
 #. item "Shops/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:3154
 msgid "Edit Clothes Shop"
 msgstr ""
 
+#. item "Shops/Boutique"
+#: build/trans_presets.java:3159
+#, fuzzy
+msgid "Boutique"
+msgstr "Continuă"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
+#. item "Shops/Boutique" label "Edit Boutique"
+#: build/trans_presets.java:3161
+msgid "Edit Boutique"
+msgstr ""
+
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:3168
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3169
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Outdoor"
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:3174
 msgid "Outdoor"
 msgstr ""
@@ -29526,15 +30256,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3176
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3182
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Dry Cleaning"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3187
 msgid "Dry Cleaning"
 msgstr ""
@@ -29542,10 +30272,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3189
 msgid "Edit Dry Cleaning"
 msgstr ""
 
 #. item "Shops/Laundry"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3194
 msgid "Laundry"
 msgstr ""
@@ -29553,56 +30283,89 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Shops/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3196
 msgid "Edit Laundry"
 msgstr ""
 
 #. item "Shops/Tailor"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3201
 msgid "Tailor"
 msgstr ""
 
 #. item "Shops/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3202
 msgid "Edit Tailor"
+msgstr ""
+
+#. item "Shops/Fabric"
+#: build/trans_presets.java:3207
+msgid "Fabric"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
+#. item "Shops/Fabric" label "Edit Fabric"
+#: build/trans_presets.java:3209
+msgid "Edit Fabric"
 msgstr ""
 
 #. <separator/>
 #. item "Shops/Computer"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3217
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3218
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3223
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3224
 msgid "Edit Electronics Shop"
 msgstr ""
 
+#. item "Shops/Mobile Phone"
+#: build/trans_presets.java:3229
+msgid "Mobile Phone"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
+#. item "Shops/Mobile Phone" label "Edit Mobile Phone"
+#: build/trans_presets.java:3231
+msgid "Edit Mobile Phone"
+msgstr ""
+
+#. item "Shops/Vacuum Cleaner"
+#: build/trans_presets.java:3238
+msgid "Vacuum Cleaner"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
+#. item "Shops/Vacuum Cleaner" label "Edit Vacuum Cleaner"
+#: build/trans_presets.java:3240
+msgid "Edit Vacuum Cleaner"
+msgstr ""
+
 #. item "Shops/Hifi"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3247
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3248
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3253
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3254
 msgid "Edit Video Shop"
 msgstr ""
@@ -29610,5 +30373,5 @@
 #. <separator/>
 #. item "Shops/Florist"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3260
 msgid "Florist"
 msgstr ""
@@ -29616,10 +30379,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Shops/Florist" label "Edit Florist"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3262
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Garden Centre"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3267
 msgid "Garden Centre"
 msgstr ""
@@ -29627,10 +30390,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3269
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Hardware"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3274
 msgid "Hardware"
 msgstr ""
@@ -29638,10 +30401,22 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Shops/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3276
 msgid "Edit Hardware Store"
 msgstr ""
 
+#. item "Shops/Paint"
+#: build/trans_presets.java:3281
+#, fuzzy
+msgid "Paint"
+msgstr "punct"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
+#. item "Shops/Paint" label "Edit Paint"
+#: build/trans_presets.java:3283
+msgid "Edit Paint"
+msgstr ""
+
 #. item "Shops/Do-it-yourself-store"
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3290
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -29649,61 +30424,129 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3292
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3297
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3298
 msgid "Edit Furniture Shop"
 msgstr ""
 
+#. item "Shops/Kitchen"
+#: build/trans_presets.java:3303
+msgid "Kitchen"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
+#. item "Shops/Kitchen" label "Edit Kitchen"
+#: build/trans_presets.java:3305
+msgid "Edit Kitchen"
+msgstr ""
+
+#. item "Shops/Curtain"
+#: build/trans_presets.java:3312
+msgid "Curtain"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
+#. item "Shops/Curtain" label "Edit Curtain"
+#: build/trans_presets.java:3314
+msgid "Edit Curtain"
+msgstr ""
+
+#. item "Shops/Frame"
+#: build/trans_presets.java:3321
+#, fuzzy
+msgid "Frame"
+msgstr "Nume"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
+#. item "Shops/Frame" label "Edit Frames"
+#: build/trans_presets.java:3323
+msgid "Edit Frames"
+msgstr ""
+
 #. item "Shops/Stationery"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3330
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3331
 msgid "Edit Stationery Shop"
 msgstr ""
 
+#. item "Shops/Copyshop"
+#: build/trans_presets.java:3336
+#, fuzzy
+msgid "Copyshop"
+msgstr "Copiază"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
+#. item "Shops/Copyshop" label "Edit Copyshop"
+#: build/trans_presets.java:3338
+msgid "Edit Copyshop"
+msgstr ""
+
 #. item "Shops/Book Store"
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3345
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3346
 msgid "Edit Book Store"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3351
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3352
 msgid "Edit Travel Agency"
 msgstr ""
 
+#. item "Shops/Musical Instrument"
+#: build/trans_presets.java:3357
+msgid "Musical Instrument"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
+#. item "Shops/Musical Instrument" label "Edit Musical Instruments"
+#: build/trans_presets.java:3359
+msgid "Edit Musical Instruments"
+msgstr ""
+
 #. item "Shops/Toys"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3366
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3367
 msgid "Edit Toy Shop"
+msgstr ""
+
+#. item "Shops/Variety Store"
+#: build/trans_presets.java:3372
+msgid "Variety Store"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
+#. item "Shops/Variety Store" label "Edit Variety Store"
+#: build/trans_presets.java:3374
+msgid "Edit Variety Store"
 msgstr ""
 
 #. <separator/>
 #. item "Shops/Vending machine"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3382
 msgid "Vending machine"
 msgstr ""
@@ -29711,5 +30554,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Shops/Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3384
 msgid "Edit Vending machine"
 msgstr ""
@@ -29717,96 +30560,91 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "Vending products"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:3386
 msgid "excrement_bags"
 msgstr ""
 
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:3112
-msgid "Account or loyalty cards"
-msgstr ""
-
 #. group "Cash"
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:3398
 msgid "Cash"
 msgstr ""
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3116
+#: build/trans_presets.java:3399
 msgid "Bank"
 msgstr ""
@@ -29814,5 +30652,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3401
 msgid "Edit Bank"
 msgstr ""
@@ -29820,10 +30658,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3123 build/trans_presets.java:3132
+#: build/trans_presets.java:3406 build/trans_presets.java:3415
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3408
 msgid "Money Exchange"
 msgstr ""
@@ -29831,5 +30669,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:3127
+#: build/trans_presets.java:3410
 msgid "Edit Money Exchange"
 msgstr ""
@@ -29837,15 +30675,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3417
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3422
 msgid "Health"
 msgstr ""
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:3423
 msgid "Doctors"
 msgstr ""
@@ -29853,20 +30691,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3425
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3430
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3431
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3436
 msgid "Pharmacy"
 msgstr ""
@@ -29874,5 +30712,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3438
 msgid "Edit Pharmacy"
 msgstr ""
@@ -29880,10 +30718,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3440
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3444
 msgid "Hospital"
 msgstr ""
@@ -29891,10 +30729,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3446
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3450
 msgid "Baby Hatch"
 msgstr ""
@@ -29902,10 +30740,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3452
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3457
 msgid "Emergency Access Point"
 msgstr ""
@@ -29914,5 +30752,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:3177
+#: build/trans_presets.java:3460
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -29921,15 +30759,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3463
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3464
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3467
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -29937,5 +30775,5 @@
 #. <space />
 #. item "Health/Veterinary"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3470
 msgid "Veterinary"
 msgstr ""
@@ -29944,120 +30782,120 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3473
 msgid "Edit Veterinary"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3197 build/trans_presets.java:3314
+#: build/trans_presets.java:3480 build/trans_presets.java:3597
 msgid "Geography"
 msgstr ""
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3481
 msgid "Boundaries"
 msgstr ""
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3482
 msgid "National"
 msgstr ""
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3483
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3488
 msgid "Administrative"
 msgstr ""
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3489
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3494
 msgid "Civil"
 msgstr ""
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3495
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3217
+#: build/trans_presets.java:3500
 msgid "Political"
 msgstr ""
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3218
+#: build/trans_presets.java:3501
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3506
 msgid "National park"
 msgstr ""
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3507
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. group "Places"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3513
 msgid "Places"
 msgstr ""
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3514
 msgid "Continent"
 msgstr ""
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3232
+#: build/trans_presets.java:3515
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Country"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3521
 msgid "Country"
 msgstr ""
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3522
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/State"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3528
 msgid "State"
 msgstr ""
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3529
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/Region"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3535
 msgid "Region"
 msgstr ""
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3253
+#: build/trans_presets.java:3536
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/County"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3542
 msgid "County"
 msgstr ""
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3543
 msgid "Edit County"
 msgstr ""
@@ -30065,15 +30903,15 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3550
 msgid "City"
 msgstr ""
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3551
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/Town"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3557
 msgid "Town"
 msgstr ""
@@ -30081,10 +30919,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3559
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3565
 msgid "Suburb"
 msgstr ""
@@ -30092,25 +30930,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3284
+#: build/trans_presets.java:3567
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Village"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:3573
 msgid "Village"
 msgstr ""
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3291
+#: build/trans_presets.java:3574
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3580
 msgid "Hamlet"
 msgstr ""
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3298
+#: build/trans_presets.java:3581
 msgid "Edit Hamlet"
 msgstr ""
@@ -30118,5 +30956,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3588
 msgid "Locality"
 msgstr ""
@@ -30124,10 +30962,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3307
+#: build/trans_presets.java:3590
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3598
 msgid "Peak"
 msgstr ""
@@ -30135,10 +30973,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3317
+#: build/trans_presets.java:3600
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3606
 msgid "Glacier"
 msgstr ""
@@ -30146,10 +30984,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:3608
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3331
+#: build/trans_presets.java:3614
 msgid "Volcano"
 msgstr ""
@@ -30157,10 +30995,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3616
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3339
+#: build/trans_presets.java:3622
 msgid "Cave Entrance"
 msgstr ""
@@ -30168,5 +31006,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3624
 msgid "Edit Cave Entrance"
 msgstr ""
@@ -30174,5 +31012,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3630
 msgid "Island"
 msgstr ""
@@ -30180,10 +31018,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3349
+#: build/trans_presets.java:3632
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3638
 msgid "Islet"
 msgstr ""
@@ -30191,15 +31029,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3357
+#: build/trans_presets.java:3640
 msgid "Edit Islet"
 msgstr ""
 
 #. group "Nature"
-#: build/trans_presets.java:3364
+#: build/trans_presets.java:3647
 msgid "Nature"
 msgstr ""
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3365
+#: build/trans_presets.java:3648
 msgid "Tree"
 msgstr ""
@@ -30208,15 +31046,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3651
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3656
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:3375
+#: build/trans_presets.java:3658
 msgid "Wood"
 msgstr ""
@@ -30225,22 +31063,22 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3661
 msgid "Edit Wood"
 msgstr ""
 
-#: build/trans_presets.java:3381 build/trans_presets.java:3390
+#: build/trans_presets.java:3664 build/trans_presets.java:3673
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:3381 build/trans_presets.java:3390
+#: build/trans_presets.java:3664 build/trans_presets.java:3673
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3381 build/trans_presets.java:3390
+#: build/trans_presets.java:3664 build/trans_presets.java:3673
 msgid "mixed"
 msgstr ""
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:3383
+#: build/trans_presets.java:3666
 msgid "Forest"
 msgstr ""
@@ -30249,15 +31087,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3669
 msgid "Edit Forest Landuse"
 msgstr ""
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3675
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3676
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -30265,15 +31103,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3681
 msgid "Scree"
 msgstr ""
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3682
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:3403
+#: build/trans_presets.java:3686
 msgid "Fell"
 msgstr ""
@@ -30281,20 +31119,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:3405
+#: build/trans_presets.java:3688
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:3409
+#: build/trans_presets.java:3692
 msgid "Scrub"
 msgstr ""
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:3410
+#: build/trans_presets.java:3693
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:3414
+#: build/trans_presets.java:3697
 msgid "Heath"
 msgstr ""
@@ -30302,15 +31140,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3699
 msgid "Edit Heath"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:3421
+#: build/trans_presets.java:3704
 msgid "Land use"
 msgstr ""
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3705
 msgid "Farmyard"
 msgstr ""
@@ -30319,45 +31157,45 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:3708
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:3713
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3714
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3719
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3720
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3725
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:3443
+#: build/trans_presets.java:3726
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3448
+#: build/trans_presets.java:3731
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3732
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -30365,25 +31203,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3738
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:3456
+#: build/trans_presets.java:3739
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3743
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3744
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:3466
+#: build/trans_presets.java:3749
 msgid "Village Green"
 msgstr ""
@@ -30391,10 +31229,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:3468
+#: build/trans_presets.java:3751
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Common"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3756
 msgid "Common"
 msgstr ""
@@ -30402,20 +31240,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:3475
+#: build/trans_presets.java:3758
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:3762
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:3480
+#: build/trans_presets.java:3763
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3767
 msgid "Recreation Ground"
 msgstr ""
@@ -30423,5 +31261,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:3486
+#: build/trans_presets.java:3769
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -30429,15 +31267,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3775
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:3493
+#: build/trans_presets.java:3776
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:3498
+#: build/trans_presets.java:3781
 msgid "Graveyard"
 msgstr ""
@@ -30445,10 +31283,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:3500
+#: build/trans_presets.java:3783
 msgid "Edit Graveyard"
 msgstr ""
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:3506
+#: build/trans_presets.java:3789
 msgid "Cemetery"
 msgstr ""
@@ -30456,40 +31294,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:3508
+#: build/trans_presets.java:3791
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3798
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:3516
+#: build/trans_presets.java:3799
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3521
+#: build/trans_presets.java:3804
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:3522
+#: build/trans_presets.java:3805
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3527
+#: build/trans_presets.java:3810
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3811
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:3533
+#: build/trans_presets.java:3816
 msgid "Railway land"
 msgstr ""
@@ -30497,15 +31335,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3818
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3540
+#: build/trans_presets.java:3823
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3824
 msgid "Edit Military Landuse"
 msgstr ""
@@ -30513,60 +31351,60 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3547
+#: build/trans_presets.java:3830
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:3548
+#: build/trans_presets.java:3831
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3553
+#: build/trans_presets.java:3836
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:3554
+#: build/trans_presets.java:3837
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3842
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:3560
+#: build/trans_presets.java:3843
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3848
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3849
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3854
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3855
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Annotation"
-#: build/trans_presets.java:3579
+#: build/trans_presets.java:3862
 msgid "Annotation"
 msgstr ""
 
 #. item "Annotation/Addresses"
-#: build/trans_presets.java:3580
+#: build/trans_presets.java:3863
 msgid "Addresses"
 msgstr ""
@@ -30575,5 +31413,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:3866
 msgid "Edit Address Information"
 msgstr ""
@@ -30581,5 +31419,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:3585
+#: build/trans_presets.java:3868
 msgid "House number"
 msgstr ""
@@ -30587,5 +31425,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:3587
+#: build/trans_presets.java:3870
 msgid "House name"
 msgstr ""
@@ -30594,48 +31432,48 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:3588 build/trans_presets.java:3705
+#: build/trans_presets.java:3871 build/trans_presets.java:3988
 msgid "Street name"
 msgstr ""
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3872
 msgid "City name"
 msgstr ""
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:3590
+#: build/trans_presets.java:3873
 msgid "Post code"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "Country code"
 msgstr ""
 
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "AT"
 msgstr ""
 
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "CH"
 msgstr ""
 
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "DE"
 msgstr ""
 
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "FR"
 msgstr ""
 
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "GB"
 msgstr ""
 
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "IT"
 msgstr ""
 
-#: build/trans_presets.java:3591
+#: build/trans_presets.java:3874
 msgid "US"
 msgstr ""
@@ -30644,5 +31482,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:3597
+#: build/trans_presets.java:3880
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -30650,32 +31488,32 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:3599
+#: build/trans_presets.java:3882
 msgid "Numbering scheme"
 msgstr ""
 
-#: build/trans_presets.java:3599
+#: build/trans_presets.java:3882
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:3599
+#: build/trans_presets.java:3882
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:3599
+#: build/trans_presets.java:3882
 msgid "alphabetic"
 msgstr ""
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3884
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:3885
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:3611
+#: build/trans_presets.java:3894
 msgid "Image"
 msgstr "Imagine"
@@ -30685,5 +31523,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:3619
+#: build/trans_presets.java:3902
 msgid "Edit Multipolygon"
 msgstr ""
@@ -30695,5 +31533,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3625 build/trans_presets.java:3642
+#: build/trans_presets.java:3908 build/trans_presets.java:3925
 msgid "outer segment"
 msgstr ""
@@ -30701,5 +31539,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3626 build/trans_presets.java:3643
+#: build/trans_presets.java:3909 build/trans_presets.java:3926
 msgid "inner segment"
 msgstr ""
@@ -30707,5 +31545,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:3629
+#: build/trans_presets.java:3912
 msgid "Boundary"
 msgstr ""
@@ -30716,5 +31554,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:3634
+#: build/trans_presets.java:3917
 msgid "Edit Boundary"
 msgstr ""
@@ -30722,36 +31560,36 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3921
 msgid "Boundary type"
 msgstr ""
 
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3921
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3921
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3921
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3921
 msgid "political"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:3639
+#: build/trans_presets.java:3922
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3644
+#: build/trans_presets.java:3927
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:3645
+#: build/trans_presets.java:3928
 msgid "Administration centre"
 msgstr ""
@@ -30759,5 +31597,5 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:3648
+#: build/trans_presets.java:3931
 msgid "Turn restriction"
 msgstr ""
@@ -30766,5 +31604,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:3651
+#: build/trans_presets.java:3934
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -30772,33 +31610,33 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "Restriction"
 msgstr ""
 
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3936
 msgid "only_straight_on"
 msgstr ""
@@ -30807,15 +31645,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3941
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3942
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:3660
+#: build/trans_presets.java:3943
 msgid "to way"
 msgstr ""
@@ -30823,5 +31661,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:3663
+#: build/trans_presets.java:3946
 msgid "Route"
 msgstr ""
@@ -30830,5 +31668,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:3666
+#: build/trans_presets.java:3949
 msgid "Edit Route"
 msgstr ""
@@ -30836,21 +31674,21 @@
 #. <key key="type" value="route" />
 #. item "Relations/Route" combo "Route type"
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "Route type"
 msgstr ""
 
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "ski"
 msgstr ""
@@ -30917,5 +31755,5 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:3668 build/trans_style.java:247
+#: build/trans_presets.java:3951 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30925,9 +31763,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3668
+#: build/trans_presets.java:3951
 msgid "detour"
 msgstr ""
@@ -30941,10 +31779,10 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3668 build/trans_style.java:1294
+#: build/trans_presets.java:3951 build/trans_style.java:1294
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Symbol description"
-#: build/trans_presets.java:3671
+#: build/trans_presets.java:3954
 msgid "Symbol description"
 msgstr ""
@@ -30954,31 +31792,31 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:3674 build/trans_presets.java:3694
+#: build/trans_presets.java:3957 build/trans_presets.java:3977
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3959
 msgid "Route state"
 msgstr ""
 
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3959
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3959
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3959
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3959
 msgid "connection"
 msgstr ""
 
 #. item "Relations/Route" text "Color (hex)"
-#: build/trans_presets.java:3677
+#: build/trans_presets.java:3960
 msgid "Color (hex)"
 msgstr ""
@@ -30987,30 +31825,30 @@
 #. <roles>
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3680
+#: build/trans_presets.java:3963
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3681
+#: build/trans_presets.java:3964
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3682
+#: build/trans_presets.java:3965
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3683
+#: build/trans_presets.java:3966
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3684
+#: build/trans_presets.java:3967
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "backward halt point"
-#: build/trans_presets.java:3685
+#: build/trans_presets.java:3968
 msgid "backward halt point"
 msgstr ""
@@ -31018,5 +31856,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:3688
+#: build/trans_presets.java:3971
 msgid "Route network"
 msgstr ""
@@ -31024,5 +31862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:3690
+#: build/trans_presets.java:3973
 msgid "Edit route network"
 msgstr ""
@@ -31031,5 +31869,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:3698
+#: build/trans_presets.java:3981
 msgid "member"
 msgstr ""
@@ -31037,5 +31875,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:3701
+#: build/trans_presets.java:3984
 msgid "Associated street"
 msgstr ""
@@ -31043,10 +31881,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:3703
+#: build/trans_presets.java:3986
 msgid "Edit associated street"
 msgstr ""
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:3708
+#: build/trans_presets.java:3991
 msgid "house"
 msgstr ""
@@ -31258,4 +32096,13 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <!-- superseeded by greengrocer -->
+#. <condition k="shop" v="groceries"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color deprecated
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -31274,5 +32121,6 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4285
+#: build/trans_style.java:633 build/trans_style.java:3006
+#: build/trans_style.java:4469
 msgid "deprecated"
 msgstr ""
@@ -31928,4 +32776,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="chimney"/>
+#. <icon annotate="true" src="misc/landmark/chimney.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="crane"/>
 #. color manmade
@@ -31952,6 +32808,22 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="groyne"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="lighthouse"/>
 #. <icon annotate="true" src="misc/landmark/lighthouse.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="mineshaft"/>
+#. <icon annotate="true" src="misc/landmark/mine.png"/>
 #. color manmade
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -32046,11 +32918,13 @@
 #: build/trans_style.java:1195 build/trans_style.java:1196
 #: build/trans_style.java:1204 build/trans_style.java:1697
-#: build/trans_style.java:1704 build/trans_style.java:1712
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1761 build/trans_style.java:1769
-#: build/trans_style.java:1777 build/trans_style.java:1785
-#: build/trans_style.java:1792 build/trans_style.java:1801
-#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1705 build/trans_style.java:1712
+#: build/trans_style.java:1720 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753 build/trans_style.java:1785
+#: build/trans_style.java:1793 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1816
 #: build/trans_style.java:1825 build/trans_style.java:1833
+#: build/trans_style.java:1841 build/trans_style.java:1849
+#: build/trans_style.java:1857
 msgid "manmade"
 msgstr ""
@@ -32100,5 +32974,5 @@
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
-#. <icon annotate="true" src="transport/railway_small.png"/>
+#. <icon annotate="true" src="transport/tram.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32550,5 +33424,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1736 build/trans_style.java:1737
+#: build/trans_style.java:1760 build/trans_style.java:1761
 msgid "pier"
 msgstr ""
@@ -32562,5 +33436,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1745
+#: build/trans_style.java:1769
 msgid "pipeline"
 msgstr ""
@@ -32704,13 +33578,21 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="sauna"/>
+#. <icon annotate="true" src="leisure/sauna.png"/>
+#. color leisure
+#: build/trans_style.java:1867 build/trans_style.java:1875
+#: build/trans_style.java:1883 build/trans_style.java:1891
 #: build/trans_style.java:1899 build/trans_style.java:1907
-#: build/trans_style.java:1915 build/trans_style.java:1923
-#: build/trans_style.java:1931 build/trans_style.java:1939
-#: build/trans_style.java:1947 build/trans_style.java:1955
-#: build/trans_style.java:1963 build/trans_style.java:1971
-#: build/trans_style.java:1979
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:2003 build/trans_style.java:2011
 msgid "leisure"
 msgstr ""
@@ -32724,5 +33606,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1891
+#: build/trans_style.java:1915
 msgid "marina"
 msgstr ""
@@ -32818,10 +33700,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1989 build/trans_style.java:1997
-#: build/trans_style.java:2005 build/trans_style.java:2013
 #: build/trans_style.java:2021 build/trans_style.java:2029
 #: build/trans_style.java:2037 build/trans_style.java:2045
 #: build/trans_style.java:2053 build/trans_style.java:2061
-#: build/trans_style.java:2069
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:2085 build/trans_style.java:2093
+#: build/trans_style.java:2101
 msgid "amenity"
 msgstr ""
@@ -32931,14 +33813,21 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2077 build/trans_style.java:2085
-#: build/trans_style.java:2093 build/trans_style.java:2101
 #: build/trans_style.java:2109 build/trans_style.java:2117
 #: build/trans_style.java:2125 build/trans_style.java:2133
 #: build/trans_style.java:2141 build/trans_style.java:2149
-#: build/trans_style.java:2156 build/trans_style.java:2165
-#: build/trans_style.java:2173
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2188 build/trans_style.java:2197
+#: build/trans_style.java:2205
 msgid "amenity_traffic"
 msgstr ""
 
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="charging_station"/>
+#. <icon annotate="true" src="accommodation/camping/hookup.png" priority="1000"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33156,4 +34045,12 @@
 #. <condition k="amenity" v="post_box"/>
 #. <icon annotate="true" src="service/post_box.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="studio"/>
+#. <icon annotate="true" src="service/studio.png"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -33373,24 +34270,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2188 build/trans_style.java:2203
-#: build/trans_style.java:2211 build/trans_style.java:2219
-#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2227 build/trans_style.java:2242
 #: build/trans_style.java:2250 build/trans_style.java:2258
-#: build/trans_style.java:2373 build/trans_style.java:2381
-#: build/trans_style.java:2388 build/trans_style.java:2397
-#: build/trans_style.java:2405 build/trans_style.java:2413
-#: build/trans_style.java:2421 build/trans_style.java:2429
-#: build/trans_style.java:2437 build/trans_style.java:2445
-#: build/trans_style.java:2508 build/trans_style.java:2516
-#: build/trans_style.java:2524 build/trans_style.java:2533
-#: build/trans_style.java:2541 build/trans_style.java:2548
-#: build/trans_style.java:2556 build/trans_style.java:2564
-#: build/trans_style.java:2572 build/trans_style.java:2580
-#: build/trans_style.java:2588 build/trans_style.java:2596
-#: build/trans_style.java:2604 build/trans_style.java:2612
-#: build/trans_style.java:2620 build/trans_style.java:2628
-#: build/trans_style.java:2636 build/trans_style.java:2644
-#: build/trans_style.java:2652 build/trans_style.java:2661
-#: build/trans_style.java:2676
+#: build/trans_style.java:2273 build/trans_style.java:2281
+#: build/trans_style.java:2289 build/trans_style.java:2297
+#: build/trans_style.java:2412 build/trans_style.java:2420
+#: build/trans_style.java:2427 build/trans_style.java:2436
+#: build/trans_style.java:2444 build/trans_style.java:2452
+#: build/trans_style.java:2460 build/trans_style.java:2468
+#: build/trans_style.java:2476 build/trans_style.java:2484
+#: build/trans_style.java:2492 build/trans_style.java:2555
+#: build/trans_style.java:2563 build/trans_style.java:2571
+#: build/trans_style.java:2580 build/trans_style.java:2588
+#: build/trans_style.java:2595 build/trans_style.java:2603
+#: build/trans_style.java:2611 build/trans_style.java:2619
+#: build/trans_style.java:2627 build/trans_style.java:2635
+#: build/trans_style.java:2643 build/trans_style.java:2651
+#: build/trans_style.java:2659 build/trans_style.java:2667
+#: build/trans_style.java:2675 build/trans_style.java:2683
+#: build/trans_style.java:2691 build/trans_style.java:2699
+#: build/trans_style.java:2708 build/trans_style.java:2723
 msgid "amenity_light"
 msgstr ""
@@ -33422,6 +34319,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:3529
+#: build/trans_style.java:2305 build/trans_style.java:2313
+#: build/trans_style.java:3713
 msgid "light_water"
 msgstr ""
@@ -33482,8 +34379,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2452 build/trans_style.java:2460
-#: build/trans_style.java:2468 build/trans_style.java:2477
-#: build/trans_style.java:2484 build/trans_style.java:2492
-#: build/trans_style.java:2500
+#: build/trans_style.java:2499 build/trans_style.java:2507
+#: build/trans_style.java:2515 build/trans_style.java:2524
+#: build/trans_style.java:2531 build/trans_style.java:2539
+#: build/trans_style.java:2547
 msgid "health"
 msgstr ""
@@ -33600,4 +34497,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="boutique"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="car"/>
 #. <icon annotate="true" src="transport/car.png"/>
@@ -33656,4 +34561,28 @@
 #.
 #. <rule>
+#. <condition k="shop" v="confectionery"/>
+#. <icon annotate="true" src="shop/groceries/confectionery.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="copyshop"/>
+#. <icon annotate="true" src="shop/copyshop.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="curtain"/>
+#. <icon annotate="true" src="shop/curtain.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="cycle_repair"/>
 #. <icon annotate="true" src="sport/bicycle.png"/>
@@ -33672,4 +34601,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="deli"/>
+#. <icon annotate="true" src="shop/groceries/deli.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="electronics"/>
 #. <icon annotate="true" src="shop/electronics.png"/>
@@ -33680,4 +34617,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="erotic"/>
+#. <icon annotate="true" src="shop/erotic.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="furniture"/>
 #. <icon annotate="true" src="shop/furniture.png"/>
@@ -33688,4 +34633,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="fabric"/>
+#. <icon annotate="true" src="shop/fabric.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="florist"/>
 #. <icon annotate="true" src="shop/florist.png"/>
@@ -33696,6 +34649,14 @@
 #.
 #. <rule>
-#. <condition k="shop" v="groceries"/>
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <condition k="shop" v="frame"/>
+#. <icon annotate="true" src="shop/frame.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="greengrocer"/>
+#. <icon annotate="true" src="shop/groceries/greengrocer.png"/>
 #. color shop
 #. <scale_min>1</scale_min>
@@ -33721,5 +34682,13 @@
 #. <rule>
 #. <condition k="shop" v="hardware"/>
-#. <icon annotate="true" src="shop/diy_store.png"/>
+#. <icon annotate="true" src="shop/hardware.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hearing_aids"/>
+#. <icon annotate="true" src="shop/hearing_aids.png"/>
 #. color shop
 #. <scale_min>1</scale_min>
@@ -33744,4 +34713,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="kitchen"/>
+#. <icon annotate="true" src="shop/kitchen.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="mall"/>
 #. <icon annotate="true" src="shop/mall.png"/>
@@ -33752,4 +34729,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="mobile_phone"/>
+#. <icon annotate="true" src="shop/mobile_phone.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="motorcycle"/>
 #. <icon annotate="true" src="vehicle/motorbike.png"/>
@@ -33760,4 +34745,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="musical_instrument"/>
+#. <icon annotate="true" src="shop/musical_instrument.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="newsagent"/>
 #. <icon annotate="true" src="shop/kiosk.png"/>
@@ -33784,4 +34777,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="paint"/>
+#. <icon annotate="true" src="shop/paint.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="seafood"/>
+#. <icon annotate="true" src="shop/groceries/seafood.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="shoes"/>
 #. <icon annotate="true" src="shop/shoes.png"/>
@@ -33832,4 +34841,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="vacuum_cleaner"/>
+#. <icon annotate="true" src="shop/vacuum_cleaner.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="variety_store"/>
+#. <icon annotate="true" src="shop/variety_store.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="video"/>
 #. <icon annotate="true" src="shop/video.png"/>
@@ -33844,26 +34869,34 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2686 build/trans_style.java:2694
-#: build/trans_style.java:2702 build/trans_style.java:2710
-#: build/trans_style.java:2718 build/trans_style.java:2726
-#: build/trans_style.java:2734 build/trans_style.java:2742
-#: build/trans_style.java:2750 build/trans_style.java:2758
-#: build/trans_style.java:2766 build/trans_style.java:2774
-#: build/trans_style.java:2782 build/trans_style.java:2790
-#: build/trans_style.java:2798 build/trans_style.java:2806
-#: build/trans_style.java:2814 build/trans_style.java:2822
-#: build/trans_style.java:2830 build/trans_style.java:2838
-#: build/trans_style.java:2846 build/trans_style.java:2854
-#: build/trans_style.java:2862 build/trans_style.java:2870
-#: build/trans_style.java:2878 build/trans_style.java:2886
-#: build/trans_style.java:2894 build/trans_style.java:2902
-#: build/trans_style.java:2910 build/trans_style.java:2918
-#: build/trans_style.java:2926 build/trans_style.java:2934
-#: build/trans_style.java:2942 build/trans_style.java:2950
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3031
+#: build/trans_style.java:2733 build/trans_style.java:2741
+#: build/trans_style.java:2749 build/trans_style.java:2757
+#: build/trans_style.java:2765 build/trans_style.java:2773
+#: build/trans_style.java:2781 build/trans_style.java:2789
+#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:2813 build/trans_style.java:2821
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2941 build/trans_style.java:2949
+#: build/trans_style.java:2957 build/trans_style.java:2965
+#: build/trans_style.java:2973 build/trans_style.java:2981
+#: build/trans_style.java:2989 build/trans_style.java:2997
+#: build/trans_style.java:3014 build/trans_style.java:3022
+#: build/trans_style.java:3030 build/trans_style.java:3038
+#: build/trans_style.java:3046 build/trans_style.java:3054
+#: build/trans_style.java:3062 build/trans_style.java:3070
+#: build/trans_style.java:3078 build/trans_style.java:3086
+#: build/trans_style.java:3094 build/trans_style.java:3102
+#: build/trans_style.java:3110 build/trans_style.java:3118
+#: build/trans_style.java:3126 build/trans_style.java:3134
+#: build/trans_style.java:3142 build/trans_style.java:3150
+#: build/trans_style.java:3158 build/trans_style.java:3166
+#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3190 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3215
 msgid "shop"
 msgstr ""
@@ -33935,8 +34968,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:3041 build/trans_style.java:3049
-#: build/trans_style.java:3057 build/trans_style.java:3065
-#: build/trans_style.java:3073 build/trans_style.java:3081
-#: build/trans_style.java:3089 build/trans_style.java:3097
+#: build/trans_style.java:3225 build/trans_style.java:3233
+#: build/trans_style.java:3241 build/trans_style.java:3249
+#: build/trans_style.java:3257 build/trans_style.java:3265
+#: build/trans_style.java:3273 build/trans_style.java:3281
 msgid "hotel"
 msgstr ""
@@ -34036,9 +35069,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3105 build/trans_style.java:3113
-#: build/trans_style.java:3121 build/trans_style.java:3129
-#: build/trans_style.java:3137 build/trans_style.java:3145
-#: build/trans_style.java:3146 build/trans_style.java:3154
-#: build/trans_style.java:3170 build/trans_style.java:3192
+#: build/trans_style.java:3289 build/trans_style.java:3297
+#: build/trans_style.java:3305 build/trans_style.java:3313
+#: build/trans_style.java:3321 build/trans_style.java:3329
+#: build/trans_style.java:3330 build/trans_style.java:3338
+#: build/trans_style.java:3354 build/trans_style.java:3376
 msgid "tourism"
 msgstr ""
@@ -34126,9 +35159,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3202 build/trans_style.java:3210
-#: build/trans_style.java:3218 build/trans_style.java:3226
-#: build/trans_style.java:3234 build/trans_style.java:3242
-#: build/trans_style.java:3250 build/trans_style.java:3258
-#: build/trans_style.java:3266 build/trans_style.java:3274
+#: build/trans_style.java:3386 build/trans_style.java:3394
+#: build/trans_style.java:3402 build/trans_style.java:3410
+#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3434 build/trans_style.java:3442
+#: build/trans_style.java:3450 build/trans_style.java:3458
 msgid "historic"
 msgstr ""
@@ -34141,5 +35174,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3322
+#: build/trans_style.java:3506
 msgid "quarry"
 msgstr ""
@@ -34153,5 +35186,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3330
+#: build/trans_style.java:3514
 msgid "landfill"
 msgstr ""
@@ -34173,5 +35206,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3338 build/trans_style.java:3346
+#: build/trans_style.java:3522 build/trans_style.java:3530
 msgid "basin"
 msgstr ""
@@ -34185,5 +35218,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3386
+#: build/trans_style.java:3570
 msgid "farmyard"
 msgstr ""
@@ -34206,5 +35239,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3395 build/trans_style.java:3403
+#: build/trans_style.java:3579 build/trans_style.java:3587
 msgid "retail"
 msgstr ""
@@ -34218,5 +35251,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3411
+#: build/trans_style.java:3595
 msgid "industrial"
 msgstr ""
@@ -34230,5 +35263,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3419
+#: build/trans_style.java:3603
 msgid "brownfield"
 msgstr ""
@@ -34242,5 +35275,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3427
+#: build/trans_style.java:3611
 msgid "greenfield"
 msgstr ""
@@ -34254,5 +35287,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3435
+#: build/trans_style.java:3619
 msgid "railland"
 msgstr ""
@@ -34309,7 +35342,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3452 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
+#: build/trans_style.java:3636 build/trans_style.java:3671
+#: build/trans_style.java:3679 build/trans_style.java:3687
+#: build/trans_style.java:3695 build/trans_style.java:3703
 msgid "military"
 msgstr ""
@@ -34323,5 +35356,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3460
+#: build/trans_style.java:3644
 msgid "cemetery"
 msgstr ""
@@ -34334,5 +35367,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3536
+#: build/trans_style.java:3720
 msgid "peak"
 msgstr ""
@@ -34347,5 +35380,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3545
+#: build/trans_style.java:3729
 msgid "glacier"
 msgstr ""
@@ -34359,5 +35392,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3553
+#: build/trans_style.java:3737
 msgid "volcano"
 msgstr ""
@@ -34411,8 +35444,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3561 build/trans_style.java:3562
-#: build/trans_style.java:3570 build/trans_style.java:3586
-#: build/trans_style.java:3650 build/trans_style.java:3658
-#: build/trans_style.java:3666
+#: build/trans_style.java:3745 build/trans_style.java:3746
+#: build/trans_style.java:3754 build/trans_style.java:3770
+#: build/trans_style.java:3834 build/trans_style.java:3842
+#: build/trans_style.java:3850
 msgid "natural"
 msgstr ""
@@ -34426,5 +35459,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3578
+#: build/trans_style.java:3762
 msgid "scrub"
 msgstr ""
@@ -34438,5 +35471,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3594
+#: build/trans_style.java:3778
 msgid "heath"
 msgstr ""
@@ -34450,5 +35483,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3602
+#: build/trans_style.java:3786
 msgid "woodarea"
 msgstr ""
@@ -34462,5 +35495,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3634
+#: build/trans_style.java:3818
 msgid "mud"
 msgstr ""
@@ -34474,5 +35507,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3642
+#: build/trans_style.java:3826
 msgid "beach"
 msgstr ""
@@ -34550,8 +35583,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3682 build/trans_style.java:3690
-#: build/trans_style.java:3698 build/trans_style.java:3706
-#: build/trans_style.java:3714 build/trans_style.java:3722
-#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3866 build/trans_style.java:3874
+#: build/trans_style.java:3882 build/trans_style.java:3890
+#: build/trans_style.java:3898 build/trans_style.java:3906
+#: build/trans_style.java:3914 build/trans_style.java:3922
 msgid "route"
 msgstr ""
@@ -34640,12 +35673,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3760 build/trans_style.java:3764
-#: build/trans_style.java:3768 build/trans_style.java:3772
-#: build/trans_style.java:3776 build/trans_style.java:3780
-#: build/trans_style.java:3784 build/trans_style.java:3788
-#: build/trans_style.java:3792 build/trans_style.java:3797
-#: build/trans_style.java:3805 build/trans_style.java:3813
-#: build/trans_style.java:3821
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3944 build/trans_style.java:3948
+#: build/trans_style.java:3952 build/trans_style.java:3956
+#: build/trans_style.java:3960 build/trans_style.java:3964
+#: build/trans_style.java:3968 build/trans_style.java:3972
+#: build/trans_style.java:3976 build/trans_style.java:3981
+#: build/trans_style.java:3989 build/trans_style.java:3997
+#: build/trans_style.java:4005
 msgid "boundary"
 msgstr ""
@@ -34795,11 +35828,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4333 build/trans_style.java:4341
-#: build/trans_style.java:4349 build/trans_style.java:4357
-#: build/trans_style.java:4365 build/trans_style.java:4373
-#: build/trans_style.java:4381 build/trans_style.java:4389
-#: build/trans_style.java:4397 build/trans_style.java:4405
-#: build/trans_style.java:4413 build/trans_style.java:4421
-#: build/trans_style.java:4429
+#: build/trans_style.java:4517 build/trans_style.java:4525
+#: build/trans_style.java:4533 build/trans_style.java:4541
+#: build/trans_style.java:4549 build/trans_style.java:4557
+#: build/trans_style.java:4565 build/trans_style.java:4573
+#: build/trans_style.java:4581 build/trans_style.java:4589
+#: build/trans_style.java:4597 build/trans_style.java:4605
+#: build/trans_style.java:4613
 msgid "place"
 msgstr ""
@@ -34813,5 +35846,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4437
+#: build/trans_style.java:4621
 msgid "tiger_data"
 msgstr ""
